Update Composer, update everything

web/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml

@@ -1,63 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - content_moderation
-id: editorial
-label: 'Editorial workflow'
-states:
-  archived:
-    label: Archived
-    weight: 5
-  draft:
-    label: Draft
-    weight: -5
-  published:
-    label: Published
-    weight: 0
-transitions:
-  archive:
-    label: Archive
-    from:
-      - published
-    to: archived
-    weight: 2
-  archived_draft:
-    label: 'Restore to Draft'
-    from:
-      - archived
-    to: draft
-    weight: 3
-  archived_published:
-    label: Restore
-    from:
-      - archived
-    to: published
-    weight: 4
-  create_new_draft:
-    label: 'Create New Draft'
-    from:
-      - draft
-      - published
-    to: draft
-    weight: 0
-  publish:
-    label: Publish
-    from:
-      - draft
-      - published
-    to: published
-    weight: 1
-type: content_moderation
-type_settings:
-  states:
-    archived:
-      published: false
-      default_revision: true
-    draft:
-      published: false
-      default_revision: false
-    published:
-      published: true
-      default_revision: true
-  entity_types: {  }

web/core/modules/content_moderation/config/optional/views.view.moderated_content.yml

@@ -0,0 +1,817 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - content_moderation
+    - node
+    - user
+id: moderated_content
+label: 'Moderated content'
+module: views
+description: 'Find and moderate content.'
+tag: ''
+base_table: node_field_revision
+base_field: vid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'view any unpublished content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: true
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            title: title
+            type: type
+            name: name
+            moderation_state: moderation_state
+            changed: changed
+          info:
+            title:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            moderation_state:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: changed
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        title:
+          id: title
+          table: node_field_revision
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Title
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: false
+            ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: title
+          plugin_id: field
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: nid
+          group_type: group
+          admin_label: ''
+          label: 'Content type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: type
+          plugin_id: field
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: user_name
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+        moderation_state:
+          id: moderation_state
+          table: node_field_revision
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Moderation state'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: content_moderation_state
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          plugin_id: field
+        changed:
+          id: changed
+          table: node_field_revision
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: false
+            ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
+        operations:
+          id: operations
+          table: node_revision
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: node
+          plugin_id: entity_operations
+      filters:
+        latest_revision:
+          id: latest_revision
+          table: node_revision
+          field: latest_revision
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: ''
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: latest_revision
+        title:
+          id: title
+          table: node_field_revision
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: title_op
+            label: Title
+            description: ''
+            use_operator: false
+            operator: title_op
+            identifier: title
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: title
+          plugin_id: string
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: nid
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'Content type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+        moderation_state:
+          id: moderation_state
+          table: node_field_revision
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            editorial-draft: editorial-draft
+            editorial-archived: editorial-archived
+          group: 1
+          exposed: true
+          expose:
+            operator_id: moderation_state_op
+            label: 'Moderation state'
+            description: ''
+            use_operator: false
+            operator: moderation_state_op
+            identifier: moderation_state
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: true
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: moderation_state_filter
+        langcode:
+          id: langcode
+          table: node_field_revision
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: langcode_op
+            label: Language
+            description: ''
+            use_operator: false
+            operator: langcode_op
+            identifier: langcode
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
+        moderation_state_1:
+          id: moderation_state_1
+          table: node_field_revision
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: 'not in'
+          value:
+            editorial-published: editorial-published
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: moderation_state_filter
+      sorts: {  }
+      title: 'Moderated content'
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No moderated content available. Only pending versions of content, such as drafts, are listed here.'
+          plugin_id: text_custom
+      relationships:
+        nid:
+          id: nid
+          table: node_field_revision
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: 'Get the actual content from a content revision.'
+          required: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: standard
+        uid:
+          id: uid
+          table: node_field_revision
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: User
+          required: false
+          entity_type: node
+          entity_field: uid
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
+  moderated_content:
+    display_plugin: page
+    id: moderated_content
+    display_title: 'Moderated content'
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/content/moderated
+      display_description: ''
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }

web/core/modules/content_moderation/config/schema/content_moderation.schema.yml

@@ -1,27 +1,29 @@
-views.filter.latest_revision:
-  type: views_filter
-  label: 'Latest revision'
+content_moderation.state:
+  type: workflows.state
   mapping:
-    value:
-      type: string
-      label: 'Value'
+    published:
+      type: boolean
+      label: 'Is published'
+    default_revision:
+      type: boolean
+      label: 'Is default revision'
 
 workflow.type_settings.content_moderation:
   type: mapping
   mapping:
     states:
       type: sequence
-      label: 'Additional state configuration for content moderation'
+      label: 'Content moderation states'
+      orderby: key
       sequence:
-        type: mapping
+        type: content_moderation.state
         label: 'States'
-        mapping:
-          published:
-            type: boolean
-            label: 'Is published'
-          default_revision:
-            type: boolean
-            label: 'Is default revision'
+    transitions:
+      type: sequence
+      orderby: key
+      sequence:
+        type: workflows.transition
+        label: 'Transitions'
     entity_types:
       type: sequence
       label: 'Entity types'

web/core/modules/content_moderation/config/schema/content_moderation.views.schema.yml

@@ -0,0 +1,18 @@
+views.filter.latest_revision:
+  type: views_filter
+  label: 'Latest revision'
+  mapping:
+    value:
+      type: string
+      label: 'Value'
+
+views.filter.moderation_state_filter:
+  type: views.filter.in_operator
+  label: 'Moderation state filter'
+  mapping:
+    limit_workflows:
+      type: sequence
+      label: 'Workflow'
+      sequence:
+        type: string
+        label: 'Workflow'

web/core/modules/content_moderation/content_moderation.api.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * API documentation for Content Moderation module.
+ */
+
+/**
+ * @defgroup content_moderation_plugin Content Moderation Workflow Type Plugin
+ * @{
+ * The Workflow Type plugin implemented by Content Moderation links revisionable
+ * entities to workflows.
+ *
+ * In the Content Moderation Workflow Type Plugin, one method requires the
+ * entity object to be passed in as a parameter, even though the interface
+ * defined by Workflows module doesn't require this:
+ * @code
+ * $workflow_type_plugin->getInitialState($entity);
+ * @endcode
+ * This is used to determine the initial moderation state based on the
+ * publishing status of the entity.
+ * @}
+ */

web/core/modules/content_moderation/content_moderation.info.yml

@@ -1,9 +1,9 @@
 name: 'Content Moderation'
 type: module
-description: 'Provides moderation states for content'
+description: 'Provides moderation states for content.'
 version: VERSION
 core: 8.x
-package: Core (Experimental)
+package: Core
 configure: entity.workflow.collection
 dependencies:
-  - workflows
+  - drupal:workflows

web/core/modules/content_moderation/content_moderation.install

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the Content Moderation module.
+ */
+
+/**
+ * Implements hook_requirements().
+ */
+function content_moderation_requirements($phase) {
+  $requirements = [];
+  if ($phase === 'install' && \Drupal::moduleHandler()->moduleExists('workspaces')) {
+    $requirements['workspaces_incompatibility'] = [
+      'severity' => REQUIREMENT_ERROR,
+      'description' => t('Content Moderation can not be installed when Workspaces is also installed.'),
+    ];
+  }
+
+  return $requirements;
+}
+
+/**
+ * Remove the 'content_revision_tracker' table.
+ */
+function content_moderation_update_8401() {
+  $database_schema = \Drupal::database()->schema();
+  if ($database_schema->tableExists('content_revision_tracker')) {
+    $database_schema->dropTable('content_revision_tracker');
+  }
+}

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

@@ -1,3 +1,14 @@
 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

web/core/modules/content_moderation/content_moderation.module

@@ -8,20 +8,24 @@
 use Drupal\content_moderation\EntityOperations;
 use Drupal\content_moderation\EntityTypeInfo;
 use Drupal\content_moderation\ContentPreprocess;
-use Drupal\content_moderation\Plugin\Action\ModerationOptOutPublishNode;
-use Drupal\content_moderation\Plugin\Action\ModerationOptOutUnpublishNode;
+use Drupal\content_moderation\Plugin\Action\ModerationOptOutPublish;
+use Drupal\content_moderation\Plugin\Action\ModerationOptOutUnpublish;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
 use Drupal\workflows\WorkflowInterface;
-use Drupal\node\NodeInterface;
-use Drupal\node\Plugin\Action\PublishNode;
-use Drupal\node\Plugin\Action\UnpublishNode;
+use Drupal\Core\Action\Plugin\Action\PublishAction;
+use Drupal\Core\Action\Plugin\Action\UnpublishAction;
 use Drupal\workflows\Entity\Workflow;
+use Drupal\views\Entity\View;
 
 /**
  * Implements hook_help().
@@ -32,13 +36,20 @@ function content_moderation_help($route_name, RouteMatchInterface $route_match)
     case 'help.page.content_moderation':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Content Moderation module provides moderation for content by applying workflows to content. For more information, see the <a href=":content_moderation">online documentation for the Content Moderation module</a>.', [':content_moderation' => 'https://www.drupal.org/documentation/modules/content_moderation']) . '</p>';
+      $output .= '<p>' . t('The Content Moderation module allows you to expand on Drupal\'s "unpublished" and "published" states for content. It allows you to have a published version that is live, but have a separate working copy that is undergoing review before it is published. This is achieved by using <a href=":workflows">Workflows</a> to apply different states and transitions to entities as needed. For more information, see the <a href=":content_moderation">online documentation for the Content Moderation module</a>.', [':content_moderation' => 'https://www.drupal.org/documentation/modules/content_moderation', ':workflows' => Url::fromRoute('help.page', ['name' => 'workflows'])->toString()]) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
-      $output .= '<dt>' . t('Configuring workflows') . '</dt>';
-      $output .= '<dd>' . t('Enable the Workflow UI module to create, edit and delete content moderation workflows.') . '</p>';
+      $output .= '<dt>' . t('Applying workflows') . '</dt>';
+      $output .= '<dd>' . t('Content Moderation allows you to apply <a href=":workflows">Workflows</a> to content, custom blocks, and other <a href=":field_help" title="Field module help, with background on content entities">content entities</a>, to provide more fine-grained publishing options. For example, a Basic page might have states such as Draft and Published, with allowed transitions such as Draft to Published (making the current revision "live"), and Published to Draft (making a new draft revision of published content).', [':workflows' => Url::fromRoute('help.page', ['name' => 'workflows'])->toString(), ':field_help' => Url::fromRoute('help.page', ['name' => 'field'])->toString()]) . '</dd>';
+      if (\Drupal::moduleHandler()->moduleExists('views')) {
+        $moderated_content_view = View::load('moderated_content');
+        if (isset($moderated_content_view) && $moderated_content_view->status() === TRUE) {
+          $output .= '<dt>' . t('Moderating content') . '</dt>';
+          $output .= '<dd>' . t('You can view a list of content awaiting moderation on the <a href=":moderated">moderated content page</a>. This will show any content in an unpublished state, such as Draft or Archived, to help surface content that requires more work from content editors.', [':moderated' => Url::fromRoute('view.moderated_content.moderated_content')->toString()]) . '</dd>';
+        }
+      }
       $output .= '<dt>' . t('Configure Content Moderation permissions') . '</dt>';
-      $output .= '<dd>' . t('Each transition is exposed as a permission. If a user has the permission for a transition, then they can move that node from the start state to the end state') . '</p>';
+      $output .= '<dd>' . t('Each transition is exposed as a permission. If a user has the permission for a transition, they can use the transition to change the state of the content item, from Draft to Published.') . '</dd>';
       $output .= '</dl>';
       return $output;
   }
@@ -62,15 +73,6 @@ function content_moderation_entity_type_alter(array &$entity_types) {
     ->entityTypeAlter($entity_types);
 }
 
-/**
- * Implements hook_entity_operation().
- */
-function content_moderation_entity_operation(EntityInterface $entity) {
-  return \Drupal::service('class_resolver')
-    ->getInstanceFromDefinition(EntityTypeInfo::class)
-    ->entityOperation($entity);
-}
-
 /**
  * Implements hook_entity_presave().
  */
@@ -98,6 +100,42 @@ function content_moderation_entity_update(EntityInterface $entity) {
     ->entityUpdate($entity);
 }
 
+/**
+ * Implements hook_entity_delete().
+ */
+function content_moderation_entity_delete(EntityInterface $entity) {
+  return \Drupal::service('class_resolver')
+    ->getInstanceFromDefinition(EntityOperations::class)
+    ->entityDelete($entity);
+}
+
+/**
+ * Implements hook_entity_revision_delete().
+ */
+function content_moderation_entity_revision_delete(EntityInterface $entity) {
+  return \Drupal::service('class_resolver')
+    ->getInstanceFromDefinition(EntityOperations::class)
+    ->entityRevisionDelete($entity);
+}
+
+/**
+ * Implements hook_entity_translation_delete().
+ */
+function content_moderation_entity_translation_delete(EntityInterface $translation) {
+  return \Drupal::service('class_resolver')
+    ->getInstanceFromDefinition(EntityOperations::class)
+    ->entityTranslationDelete($translation);
+}
+
+/**
+ * Implements hook_entity_prepare_form().
+ */
+function content_moderation_entity_prepare_form(EntityInterface $entity, $operation, FormStateInterface $form_state) {
+  \Drupal::service('class_resolver')
+    ->getInstanceFromDefinition(EntityTypeInfo::class)
+    ->entityPrepareForm($entity, $operation, $form_state);
+}
+
 /**
  * Implements hook_form_alter().
  */
@@ -109,9 +147,6 @@ function content_moderation_form_alter(&$form, FormStateInterface $form_state, $
 
 /**
  * Implements hook_preprocess_HOOK().
- *
- * Many default node templates rely on $page to determine whether to output the
- * node title as part of the node content.
  */
 function content_moderation_preprocess_node(&$variables) {
   \Drupal::service('class_resolver')
@@ -138,34 +173,34 @@ function content_moderation_entity_view(array &$build, EntityInterface $entity,
 }
 
 /**
- * Implements hook_node_access().
+ * Implements hook_entity_access().
  *
- * Nodes in particular should be viewable if unpublished and the user has
- * the appropriate permission. This permission is therefore effectively
- * mandatory for any user that wants to moderate things.
+ * Entities should be viewable if unpublished and the user has the appropriate
+ * permission. This permission is therefore effectively mandatory for any user
+ * that wants to moderate things.
  */
-function content_moderation_node_access(NodeInterface $node, $operation, AccountInterface $account) {
+function content_moderation_entity_access(EntityInterface $entity, $operation, AccountInterface $account) {
   /** @var \Drupal\content_moderation\ModerationInformationInterface $moderation_info */
   $moderation_info = Drupal::service('content_moderation.moderation_information');
 
   $access_result = NULL;
   if ($operation === 'view') {
-    $access_result = (!$node->isPublished())
+    $access_result = (($entity instanceof EntityPublishedInterface) && !$entity->isPublished())
       ? AccessResult::allowedIfHasPermission($account, 'view any unpublished content')
       : AccessResult::neutral();
 
-    $access_result->addCacheableDependency($node);
+    $access_result->addCacheableDependency($entity);
   }
-  elseif ($operation === 'update' && $moderation_info->isModeratedEntity($node) && $node->moderation_state) {
+  elseif ($operation === 'update' && $moderation_info->isModeratedEntity($entity) && $entity->moderation_state) {
     /** @var \Drupal\content_moderation\StateTransitionValidation $transition_validation */
     $transition_validation = \Drupal::service('content_moderation.state_transition_validation');
 
-    $valid_transition_targets = $transition_validation->getValidTransitions($node, $account);
-    $access_result = $valid_transition_targets ? AccessResult::neutral() : AccessResult::forbidden();
+    $valid_transition_targets = $transition_validation->getValidTransitions($entity, $account);
+    $access_result = $valid_transition_targets ? AccessResult::neutral() : AccessResult::forbidden('No valid transitions exist for given account.');
 
-    $access_result->addCacheableDependency($node);
+    $access_result->addCacheableDependency($entity);
     $access_result->addCacheableDependency($account);
-    $workflow = \Drupal::service('content_moderation.moderation_information')->getWorkflowForEntity($node);
+    $workflow = $moderation_info->getWorkflowForEntity($entity);
     $access_result->addCacheableDependency($workflow);
     foreach ($valid_transition_targets as $valid_transition_target) {
       $access_result->addCacheableDependency($valid_transition_target);
@@ -175,6 +210,27 @@ function content_moderation_node_access(NodeInterface $node, $operation, Account
   return $access_result;
 }
 
+/**
+ * Implements hook_entity_field_access().
+ */
+function content_moderation_entity_field_access($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) {
+  if ($items && $operation === 'edit') {
+    /** @var \Drupal\content_moderation\ModerationInformationInterface $moderation_info */
+    $moderation_info = Drupal::service('content_moderation.moderation_information');
+
+    $entity_type = \Drupal::entityTypeManager()->getDefinition($field_definition->getTargetEntityTypeId());
+
+    $entity = $items->getEntity();
+
+    // Deny edit access to the published field if the entity is being moderated.
+    if ($entity_type->hasKey('published') && $moderation_info->isModeratedEntity($entity) && $entity->moderation_state && $field_definition->getName() == $entity_type->getKey('published')) {
+      return AccessResult::forbidden('Cannot edit the published field of moderated entities.');
+    }
+  }
+
+  return AccessResult::neutral();
+}
+
 /**
  * Implements hook_theme().
  */
@@ -189,13 +245,15 @@ function content_moderation_action_info_alter(&$definitions) {
 
   // The publish/unpublish actions are not valid on moderated entities. So swap
   // their implementations out for alternates that will become a no-op on a
-  // moderated node. If another module has already swapped out those classes,
+  // moderated entity. If another module has already swapped out those classes,
   // though, we'll be polite and do nothing.
-  if (isset($definitions['node_publish_action']['class']) && $definitions['node_publish_action']['class'] == PublishNode::class) {
-    $definitions['node_publish_action']['class'] = ModerationOptOutPublishNode::class;
-  }
-  if (isset($definitions['node_unpublish_action']['class']) && $definitions['node_unpublish_action']['class'] == UnpublishNode::class) {
-    $definitions['node_unpublish_action']['class'] = ModerationOptOutUnpublishNode::class;
+  foreach ($definitions as &$definition) {
+    if ($definition['id'] === 'entity:publish_action' && $definition['class'] == PublishAction::class) {
+      $definition['class'] = ModerationOptOutPublish::class;
+    }
+    if ($definition['id'] === 'entity:unpublish_action' && $definition['class'] == UnpublishAction::class) {
+      $definition['class'] = ModerationOptOutUnpublish::class;
+    }
   }
 }
 
@@ -203,6 +261,7 @@ function content_moderation_action_info_alter(&$definitions) {
  * Implements hook_entity_bundle_info_alter().
  */
 function content_moderation_entity_bundle_info_alter(&$bundles) {
+  $translatable = FALSE;
   /** @var \Drupal\workflows\WorkflowInterface $workflow */
   foreach (Workflow::loadMultipleByType('content_moderation') as $workflow) {
     /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $plugin */
@@ -211,10 +270,32 @@ function content_moderation_entity_bundle_info_alter(&$bundles) {
       foreach ($plugin->getBundlesForEntityType($entity_type_id) as $bundle_id) {
         if (isset($bundles[$entity_type_id][$bundle_id])) {
           $bundles[$entity_type_id][$bundle_id]['workflow'] = $workflow->id();
+          // If we have even one moderation-enabled translatable bundle, we need
+          // to make the moderation state bundle translatable as well, to enable
+          // the revision translation merge logic also for content moderation
+          // state revisions.
+          if (!empty($bundles[$entity_type_id][$bundle_id]['translatable'])) {
+            $translatable = TRUE;
+          }
         }
       }
     }
   }
+  $bundles['content_moderation_state']['content_moderation_state']['translatable'] = $translatable;
+}
+
+/**
+ * Implements hook_entity_bundle_delete().
+ */
+function content_moderation_entity_bundle_delete($entity_type_id, $bundle_id) {
+  // Remove non-configuration based bundles from content moderation based
+  // workflows when they are removed.
+  foreach (Workflow::loadMultipleByType('content_moderation') as $workflow) {
+    if ($workflow->getTypePlugin()->appliesToEntityTypeAndBundle($entity_type_id, $bundle_id)) {
+      $workflow->getTypePlugin()->removeEntityTypeAndBundle($entity_type_id, $bundle_id);
+      $workflow->save();
+    }
+  }
 }
 
 /**
@@ -232,5 +313,9 @@ function content_moderation_workflow_insert(WorkflowInterface $entity) {
  * Implements hook_ENTITY_TYPE_update().
  */
 function content_moderation_workflow_update(WorkflowInterface $entity) {
-  content_moderation_workflow_insert($entity);
+  // Clear bundle cache so workflow gets added or removed from the bundle
+  // information.
+  \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+  // Clear field cache so extra field is added or removed.
+  \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
 }

web/core/modules/content_moderation/content_moderation.permissions.yml

@@ -1,19 +1,9 @@
 view any unpublished content:
   title: 'View any unpublished content'
-  description: 'This permission is necessary for any users that may moderate content.'
-
-view content moderation:
-  title: 'View content moderation'
-  description: 'View content moderation.'
-
-'administer content moderation':
-  title: 'Administer content moderation'
-  description: 'Administer workflows on content entities.'
-  'restrict access': TRUE
 
 view latest version:
   title: 'View the latest version'
-  description: 'View the latest version of an entity. (Also requires "View any unpublished content" permission)'
+  description: 'Requires the "View any unpublished content" or "View own unpublished content" permission'
 
 permission_callbacks:
   - \Drupal\content_moderation\Permissions::transitionPermissions

web/core/modules/content_moderation/content_moderation.post_update.php

@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * @file
+ * Post update functions for the Content Moderation module.
+ */
+
+use Drupal\Core\Site\Settings;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Synchronize moderation state default revisions with their host entities.
+ */
+function content_moderation_post_update_update_cms_default_revisions(&$sandbox) {
+  // For every moderated entity, identify the default revision ID, track the
+  // corresponding "content_moderation_state" revision and save it as the new
+  // default revision, if needed.
+
+  // Initialize sandbox info.
+  $entity_type_id = &$sandbox['entity_type_id'];
+  if (!isset($entity_type_id)) {
+    $sandbox['bundles'] = [];
+    $sandbox['entity_type_ids'] = [];
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    foreach (Workflow::loadMultipleByType('content_moderation') as $workflow) {
+      /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $plugin */
+      $plugin = $workflow->getTypePlugin();
+      foreach ($plugin->getEntityTypes() as $entity_type_id) {
+        $sandbox['entity_type_ids'][$entity_type_id] = $entity_type_id;
+        foreach ($plugin->getBundlesForEntityType($entity_type_id) as $bundle) {
+          $sandbox['bundles'][$entity_type_id][$bundle] = $bundle;
+        }
+      }
+    }
+    $sandbox['offset'] = 0;
+    $sandbox['limit'] = Settings::get('entity_update_batch_size', 50);
+    $sandbox['total'] = count($sandbox['entity_type_ids']);
+    $entity_type_id = array_shift($sandbox['entity_type_ids']);
+  }
+
+  // If there are no moderated bundles or we processed all of them, we are done.
+  $entity_type_manager = \Drupal::entityTypeManager();
+  /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $content_moderation_state_storage */
+  $content_moderation_state_storage = $entity_type_manager->getStorage('content_moderation_state');
+  if (!$entity_type_id) {
+    $content_moderation_state_storage->resetCache();
+    $sandbox['#finished'] = 1;
+    return;
+  }
+
+  // Retrieve a batch of moderated entities to be processed.
+  $storage = $entity_type_manager->getStorage($entity_type_id);
+  $entity_type = $entity_type_manager->getDefinition($entity_type_id);
+  $query = $storage->getQuery()
+    ->accessCheck(FALSE)
+    ->sort($entity_type->getKey('id'))
+    ->range($sandbox['offset'], $sandbox['limit']);
+  $bundle_key = $entity_type->getKey('bundle');
+  if ($bundle_key && !empty($sandbox['bundles'][$entity_type_id])) {
+    $bundles = array_keys($sandbox['bundles'][$entity_type_id]);
+    $query->condition($bundle_key, $bundles, 'IN');
+  }
+  $entity_ids = $query->execute();
+
+  // Compute progress status and skip to the next entity type, if needed.
+  $sandbox['#finished'] = ($sandbox['total'] - count($sandbox['entity_type_ids']) - 1) / $sandbox['total'];
+  if (!$entity_ids) {
+    $sandbox['offset'] = 0;
+    $entity_type_id = array_shift($sandbox['entity_type_ids']) ?: FALSE;
+    return;
+  }
+
+  // Load the "content_moderation_state" revisions corresponding to the
+  // moderated entity default revisions.
+  $result = $content_moderation_state_storage->getQuery()
+    ->allRevisions()
+    ->condition('content_entity_type_id', $entity_type_id)
+    ->condition('content_entity_revision_id', array_keys($entity_ids), 'IN')
+    ->execute();
+  /** @var \Drupal\Core\Entity\ContentEntityInterface[] $revisions */
+  $revisions = $content_moderation_state_storage->loadMultipleRevisions(array_keys($result));
+
+  // Update "content_moderation_state" data.
+  foreach ($revisions as $revision) {
+    if (!$revision->isDefaultRevision()) {
+      $revision->setNewRevision(FALSE);
+      $revision->isDefaultRevision(TRUE);
+      $content_moderation_state_storage->save($revision);
+    }
+  }
+
+  // Clear static cache to avoid memory issues.
+  $storage->resetCache($entity_ids);
+
+  $sandbox['offset'] += $sandbox['limit'];
+}

web/core/modules/content_moderation/content_moderation.routing.yml

@@ -0,0 +1,15 @@
+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:
+    _form: '\Drupal\content_moderation\Form\ContentModerationConfigureEntityTypesForm'
+    _title_callback: '\Drupal\content_moderation\Form\ContentModerationConfigureEntityTypesForm::getTitle'
+  requirements:
+    _permission: 'administer workflows'

web/core/modules/content_moderation/content_moderation.services.yml

@@ -1,7 +1,7 @@
 services:
   paramconverter.latest_revision:
     class: Drupal\content_moderation\ParamConverter\EntityRevisionConverter
-    arguments: ['@entity.manager', '@content_moderation.moderation_information']
+    parent: paramconverter.entity
     tags:
       - { name: paramconverter, priority: 5 }
   content_moderation.state_transition_validation:
@@ -15,8 +15,13 @@ services:
     arguments: ['@content_moderation.moderation_information']
     tags:
       - { name: access_check, applies_to: _content_moderation_latest_version }
-  content_moderation.revision_tracker:
-    class: Drupal\content_moderation\RevisionTracker
-    arguments: ['@database']
+  content_moderation.config_import_subscriber:
+    class: Drupal\content_moderation\EventSubscriber\ConfigImportSubscriber
+    arguments: ['@config.manager', '@entity_type.manager']
     tags:
-     - { name: backend_overridable }
+      - { name: event_subscriber }
+  content_moderation.route_subscriber:
+    class: Drupal\content_moderation\Routing\ContentModerationRouteSubscriber
+    arguments: ['@entity_type.manager']
+    tags:
+      - { name: event_subscriber }

web/core/modules/content_moderation/content_moderation.views.inc

@@ -16,13 +16,6 @@ function content_moderation_views_data() {
   return _content_moderation_views_data_object()->getViewsData();
 }
 
-/**
- * Implements hook_views_data_alter().
- */
-function content_moderation_views_data_alter(array &$data) {
-  _content_moderation_views_data_object()->alterViewsData($data);
-}
-
 /**
  * Creates a ViewsData object to respond to views hooks.
  *

web/core/modules/content_moderation/css/content_moderation.module.css

@@ -2,18 +2,37 @@
  * @file
  * Component styles for the content_moderation module.
  */
-ul.entity-moderation-form {
+.entity-moderation-form {
   list-style: none;
   display: -webkit-flex; /* Safari */
   display: flex;
   -webkit-flex-wrap: wrap; /* Safari */
   flex-wrap: wrap;
-  -webkit-justify-content: space-around; /* Safari */
-  justify-content: space-around;
-  -webkit-align-items: flex-end; /* Safari */
-  align-items: flex-end;
+  -webkit-align-items: flex-start; /* Safari */
+  align-items: flex-start;
 }
 
-ul.entity-moderation-form input[type=submit] {
+.entity-moderation-form__item {
+  margin-right: 2em;
+  display: table;
+}
+
+.entity-moderation-form__item:last-child {
+  -webkit-align-self: flex-end; /* Safari */
+  align-self: flex-end;
+  margin-right: 0;
+}
+
+.entity-moderation-form .form-item {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+.entity-moderation-form .form-item label {
+  padding-bottom: 0.25em;
+  display: table;
+}
+
+.entity-moderation-form input[type=submit] {
   margin-bottom: 1.2em;
 }

web/core/modules/content_moderation/css/content_moderation.theme.css

@@ -2,6 +2,9 @@
  * @file
  * Theme styles for the content_moderation module.
  */
-ul.entity-moderation-form {
-  border-bottom: 1px solid gray;
+.entity-moderation-form {
+  border: 1px dashed #bbb;
+  margin: 2em 0;
+  background: #fff;
+  padding-left: 1em;
 }

web/core/modules/content_moderation/src/Access/LatestRevisionCheck.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\content_moderation\Access;
 
+use Drupal\Core\Access\AccessException;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
@@ -34,7 +35,7 @@ class LatestRevisionCheck implements AccessInterface {
   }
 
   /**
-   * Checks that there is a forward revision available.
+   * Checks that there is a pending revision available.
    *
    * This checker assumes the presence of an '_entity_access' requirement key
    * in the same form as used by EntityAccessCheck.
@@ -54,7 +55,7 @@ class LatestRevisionCheck implements AccessInterface {
   public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account) {
     // This tab should not show up unless there's a reason to show it.
     $entity = $this->loadEntity($route, $route_match);
-    if ($this->moderationInfo->hasForwardRevision($entity)) {
+    if ($this->moderationInfo->hasPendingRevision($entity)) {
       // Check the global permissions first.
       $access_result = AccessResult::allowedIfHasPermissions($account, ['view latest version', 'view any unpublished content']);
       if (!$access_result->isAllowed()) {
@@ -67,7 +68,7 @@ class LatestRevisionCheck implements AccessInterface {
       return $access_result->addCacheableDependency($entity);
     }
 
-    return AccessResult::forbidden()->addCacheableDependency($entity);
+    return AccessResult::forbidden('No pending revision for moderated entity.')->addCacheableDependency($entity);
   }
 
   /**
@@ -81,10 +82,8 @@ class LatestRevisionCheck implements AccessInterface {
    * @return \Drupal\Core\Entity\ContentEntityInterface
    *   returns the Entity in question.
    *
-   * @throws \Exception
-   *   A generic exception is thrown if the entity couldn't be loaded. This
-   *   almost always implies a developer error, so it should get turned into
-   *   an HTTP 500.
+   * @throws \Drupal\Core\Access\AccessException
+   *   An AccessException is thrown if the entity couldn't be loaded.
    */
   protected function loadEntity(Route $route, RouteMatchInterface $route_match) {
     $entity_type = $route->getOption('_content_moderation_entity_type');
@@ -94,7 +93,7 @@ class LatestRevisionCheck implements AccessInterface {
         return $entity;
       }
     }
-    throw new \Exception(sprintf('%s is not a valid entity route. The LatestRevisionCheck access checker may only be used with a route that has a single entity parameter.', $route_match->getRouteName()));
+    throw new AccessException(sprintf('%s is not a valid entity route. The LatestRevisionCheck access checker may only be used with a route that has a single entity parameter.', $route_match->getRouteName()));
   }
 
 }

web/core/modules/content_moderation/src/ContentModerationStateStorageSchema.php

@@ -25,12 +25,16 @@ class ContentModerationStateStorageSchema extends SqlContentEntityStorageSchema
       'workflow',
       'langcode',
     ];
-    $schema['content_moderation_state_field_data']['unique keys'] += [
-      'content_moderation_state__lookup' => $unique_keys,
-    ];
-    $schema['content_moderation_state_field_revision']['unique keys'] += [
-      'content_moderation_state__lookup' => $unique_keys,
-    ];
+    if ($data_table = $this->storage->getDataTable()) {
+      $schema[$data_table]['unique keys'] += [
+        'content_moderation_state__lookup' => $unique_keys,
+      ];
+    }
+    if ($revision_data_table = $this->storage->getRevisionDataTable()) {
+      $schema[$revision_data_table]['unique keys'] += [
+        'content_moderation_state__lookup' => $unique_keys,
+      ];
+    }
 
     return $schema;
   }

web/core/modules/content_moderation/src/ContentPreprocess.php

@@ -9,13 +9,15 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Determines whether a route is the "Latest version" tab of a node.
+ *
+ * @internal
  */
 class ContentPreprocess implements ContainerInjectionInterface {
 
   /**
    * The route match service.
    *
-   * @var \Drupal\Core\Routing\RouteMatchInterface $routeMatch
+   * @var \Drupal\Core\Routing\RouteMatchInterface
    */
   protected $routeMatch;
 
@@ -39,10 +41,10 @@ class ContentPreprocess implements ContainerInjectionInterface {
   }
 
   /**
-   * Wrapper for hook_preprocess_HOOK().
-   *
    * @param array $variables
    *   Theme variables to preprocess.
+   *
+   * @see hook_preprocess_HOOK()
    */
   public function preprocessNode(array &$variables) {
     // Set the 'page' template variable when the node is being displayed on the

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

@@ -0,0 +1,26 @@
+<?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\Core\Render\RendererInterface::render().
+   */
+  public function nodeListing() {
+    $entity_type = $this->entityTypeManager()->getDefinition('node');
+
+    return $this->entityTypeManager()->createHandlerInstance(ModeratedNodeListBuilder::class, $entity_type)->render();
+  }
+
+}

web/core/modules/content_moderation/src/Entity/ContentModerationState.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\content_moderation\Entity;
 
-use Drupal\content_moderation\ContentModerationStateInterface;
 use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\TypedData\TranslatableInterface;
@@ -31,6 +31,7 @@ use Drupal\user\UserInterface;
  *   data_table = "content_moderation_state_field_data",
  *   revision_data_table = "content_moderation_state_field_revision",
  *   translatable = TRUE,
+ *   internal = TRUE,
  *   entity_keys = {
  *     "id" = "id",
  *     "revision" = "revision_id",
@@ -39,6 +40,11 @@ use Drupal\user\UserInterface;
  *     "langcode" = "langcode",
  *   }
  * )
+ *
+ * @internal
+ *   This entity is marked internal because it should not be used directly to
+ *   alter the moderation state of an entity. Instead, the computed
+ *   moderation_state field should be set on the entity directly.
  */
 class ContentModerationState extends ContentEntityBase implements ContentModerationStateInterface {
 
@@ -61,7 +67,6 @@ class ContentModerationState extends ContentEntityBase implements ContentModerat
       ->setDescription(t('The workflow the moderation state is in.'))
       ->setSetting('target_type', 'workflow')
       ->setRequired(TRUE)
-      ->setTranslatable(TRUE)
       ->setRevisionable(TRUE);
 
     $fields['moderation_state'] = BaseFieldDefinition::create('string')
@@ -137,6 +142,44 @@ class ContentModerationState extends ContentEntityBase implements ContentModerat
     $content_moderation_state->realSave();
   }
 
+  /**
+   * Loads a content moderation state entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   A moderated entity object.
+   *
+   * @return \Drupal\content_moderation\Entity\ContentModerationStateInterface|null
+   *   The related content moderation state or NULL if none could be found.
+   *
+   * @internal
+   *   This method should only be called by code directly handling the
+   *   ContentModerationState entity objects.
+   */
+  public static function loadFromModeratedEntity(EntityInterface $entity) {
+    $content_moderation_state = NULL;
+    $moderation_info = \Drupal::service('content_moderation.moderation_information');
+
+    if ($moderation_info->isModeratedEntity($entity)) {
+      /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+      $storage = \Drupal::entityTypeManager()->getStorage('content_moderation_state');
+
+      $ids = $storage->getQuery()
+        ->condition('content_entity_type_id', $entity->getEntityTypeId())
+        ->condition('content_entity_id', $entity->id())
+        ->condition('workflow', $moderation_info->getWorkflowForEntity($entity)->id())
+        ->condition('content_entity_revision_id', $entity->getLoadedRevisionId())
+        ->allRevisions()
+        ->execute();
+
+      if ($ids) {
+        /** @var \Drupal\content_moderation\Entity\ContentModerationStateInterface $content_moderation_state */
+        $content_moderation_state = $storage->loadRevision(key($ids));
+      }
+    }
+
+    return $content_moderation_state;
+  }
+
   /**
    * Default value callback for the 'uid' base field definition.
    *
@@ -179,4 +222,16 @@ class ContentModerationState extends ContentEntityBase implements ContentModerat
     return parent::save();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getFieldsToSkipFromTranslationChangesCheck() {
+    $field_names = parent::getFieldsToSkipFromTranslationChangesCheck();
+    // We need to skip the parent entity revision ID, since that will always
+    // change on every save, otherwise every translation would be marked as
+    // affected regardless of actual changes.
+    $field_names[] = 'content_entity_revision_id';
+    return $field_names;
+  }
+
 }

web/core/modules/content_moderation/src/Entity/ContentModerationStateInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation;
+namespace Drupal\content_moderation\Entity;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\user\EntityOwnerInterface;
@@ -10,6 +10,8 @@ use Drupal\user\EntityOwnerInterface;
  *
  * Content moderation state entities track the moderation state of other content
  * entities.
+ *
+ * @internal
  */
 interface ContentModerationStateInterface extends ContentEntityInterface, EntityOwnerInterface {
 

web/core/modules/content_moderation/src/Entity/Handler/BlockContentModerationHandler.php

@@ -6,6 +6,8 @@ use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Customizations for block content entities.
+ *
+ * @internal
  */
 class BlockContentModerationHandler extends ModerationHandler {
 
@@ -13,9 +15,9 @@ class BlockContentModerationHandler extends ModerationHandler {
    * {@inheritdoc}
    */
   public function enforceRevisionsEntityFormAlter(array &$form, FormStateInterface $form_state, $form_id) {
-    $form['revision_information']['revision']['#default_value'] = TRUE;
-    $form['revision_information']['revision']['#disabled'] = TRUE;
-    $form['revision_information']['revision']['#description'] = $this->t('Revisions must be required when moderation is enabled.');
+    $form['revision']['#default_value'] = TRUE;
+    $form['revision']['#disabled'] = TRUE;
+    $form['revision']['#description'] = $this->t('Revisions must be required when moderation is enabled.');
   }
 
   /**

web/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php

@@ -14,6 +14,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * Common customizations for most/all entities.
  *
  * This class is intended primarily as a base class.
+ *
+ * @internal
  */
 class ModerationHandler implements ModerationHandlerInterface, EntityHandlerInterface {
 

web/core/modules/content_moderation/src/Entity/Handler/ModerationHandlerInterface.php

@@ -11,6 +11,8 @@ use Drupal\Core\Form\FormStateInterface;
  * Much of the logic contained in this handler is an indication of flaws
  * in the Entity API that are insufficiently standardized between entity types.
  * Hopefully over time functionality can be removed from this interface.
+ *
+ * @internal
  */
 interface ModerationHandlerInterface {
 

web/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php

@@ -9,6 +9,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Customizations for node entities.
+ *
+ * @internal
  */
 class NodeModerationHandler extends ModerationHandler {
 
@@ -51,14 +53,9 @@ class NodeModerationHandler extends ModerationHandler {
    * {@inheritdoc}
    */
   public function enforceRevisionsBundleFormAlter(array &$form, FormStateInterface $form_state, $form_id) {
-    /* @var \Drupal\node\Entity\NodeType $entity */
-    $entity = $form_state->getFormObject()->getEntity();
-
-    if ($this->moderationInfo->getWorkflowForEntity($entity)) {
-      // Force the revision checkbox on.
-      $form['workflow']['options']['#default_value']['revision'] = 'revision';
-      $form['workflow']['options']['revision']['#disabled'] = TRUE;
-    }
+    // Force the revision checkbox on.
+    $form['workflow']['options']['#value']['revision'] = 'revision';
+    $form['workflow']['options']['revision']['#disabled'] = TRUE;
   }
 
 }

web/core/modules/content_moderation/src/Entity/Routing/EntityModerationRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Routing;
+namespace Drupal\content_moderation\Entity\Routing;
 
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityHandlerInterface;
@@ -17,6 +17,8 @@ use Symfony\Component\Routing\RouteCollection;
  * Provides the following routes:
  * - The latest version tab, showing the latest revision of an entity, not the
  *   default one.
+ *
+ * @internal
  */
 class EntityModerationRouteProvider implements EntityRouteProviderInterface, EntityHandlerInterface {
 
@@ -79,14 +81,14 @@ class EntityModerationRouteProvider implements EntityRouteProviderInterface, Ent
           '_title_callback' => '\Drupal\Core\Entity\Controller\EntityController::title',
         ])
         // If the entity type is a node, unpublished content will be visible
-        // if the user has the "view all unpublished content" permission.
+        // if the user has the "view any unpublished content" permission.
         ->setRequirement('_entity_access', "{$entity_type_id}.view")
         ->setRequirement('_content_moderation_latest_version', 'TRUE')
         ->setOption('_content_moderation_entity_type', $entity_type_id)
         ->setOption('parameters', [
           $entity_type_id => [
             'type' => 'entity:' . $entity_type_id,
-            'load_forward_revision' => 1,
+            'load_latest_revision' => TRUE,
           ],
         ]);
 

web/core/modules/content_moderation/src/EntityOperations.php

@@ -3,19 +3,24 @@
 namespace Drupal\content_moderation;
 
 use Drupal\content_moderation\Entity\ContentModerationState as ContentModerationStateEntity;
+use Drupal\content_moderation\Entity\ContentModerationStateInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\TypedData\TranslatableInterface;
 use Drupal\content_moderation\Form\EntityModerationForm;
-use Drupal\workflows\WorkflowInterface;
+use Drupal\Core\Routing\RouteBuilderInterface;
+use Drupal\workflows\Entity\Workflow;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines a class for reacting to entity events.
+ *
+ * @internal
  */
 class EntityOperations implements ContainerInjectionInterface {
 
@@ -40,13 +45,6 @@ class EntityOperations implements ContainerInjectionInterface {
    */
   protected $formBuilder;
 
-  /**
-   * The Revision Tracker service.
-   *
-   * @var \Drupal\content_moderation\RevisionTrackerInterface
-   */
-  protected $tracker;
-
   /**
    * The entity bundle information service.
    *
@@ -54,6 +52,13 @@ class EntityOperations implements ContainerInjectionInterface {
    */
   protected $bundleInfo;
 
+  /**
+   * The router builder service.
+   *
+   * @var \Drupal\Core\Routing\RouteBuilderInterface
+   */
+  protected $routerBuilder;
+
   /**
    * Constructs a new EntityOperations object.
    *
@@ -63,17 +68,17 @@ class EntityOperations implements ContainerInjectionInterface {
    *   Entity type manager service.
    * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
    *   The form builder.
-   * @param \Drupal\content_moderation\RevisionTrackerInterface $tracker
-   *   The revision tracker.
    * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
    *   The entity bundle information service.
+   * @param \Drupal\Core\Routing\RouteBuilderInterface $router_builder
+   *   The router builder service.
    */
-  public function __construct(ModerationInformationInterface $moderation_info, EntityTypeManagerInterface $entity_type_manager, FormBuilderInterface $form_builder, RevisionTrackerInterface $tracker, EntityTypeBundleInfoInterface $bundle_info) {
+  public function __construct(ModerationInformationInterface $moderation_info, EntityTypeManagerInterface $entity_type_manager, FormBuilderInterface $form_builder, EntityTypeBundleInfoInterface $bundle_info, RouteBuilderInterface $router_builder) {
     $this->moderationInfo = $moderation_info;
     $this->entityTypeManager = $entity_type_manager;
     $this->formBuilder = $form_builder;
-    $this->tracker = $tracker;
     $this->bundleInfo = $bundle_info;
+    $this->routerBuilder = $router_builder;
   }
 
   /**
@@ -84,8 +89,8 @@ class EntityOperations implements ContainerInjectionInterface {
       $container->get('content_moderation.moderation_information'),
       $container->get('entity_type.manager'),
       $container->get('form_builder'),
-      $container->get('content_moderation.revision_tracker'),
-      $container->get('entity_type.bundle.info')
+      $container->get('entity_type.bundle.info'),
+      $container->get('router.builder')
     );
   }
 
@@ -94,6 +99,8 @@ class EntityOperations implements ContainerInjectionInterface {
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity being saved.
+   *
+   * @see hook_entity_presave()
    */
   public function entityPresave(EntityInterface $entity) {
     if (!$this->moderationInfo->isModeratedEntity($entity)) {
@@ -103,23 +110,23 @@ class EntityOperations implements ContainerInjectionInterface {
     if ($entity->moderation_state->value) {
       $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
       /** @var \Drupal\content_moderation\ContentModerationState $current_state */
-      $current_state = $workflow->getState($entity->moderation_state->value);
+      $current_state = $workflow->getTypePlugin()
+        ->getState($entity->moderation_state->value);
 
-      // This entity is default if it is new, a new translation, the default
-      // revision, or the default revision is not published.
+      // This entity is default if it is new, the default revision, or the
+      // default revision is not published.
       $update_default_revision = $entity->isNew()
-        || $entity->isNewTranslation()
         || $current_state->isDefaultRevisionState()
-        || !$this->isDefaultRevisionPublished($entity, $workflow);
+        || !$this->moderationInfo->isDefaultRevisionPublished($entity);
 
       // Fire per-entity-type logic for handling the save process.
-      $this->entityTypeManager->getHandler($entity->getEntityTypeId(), 'moderation')->onPresave($entity, $update_default_revision, $current_state->isPublishedState());
+      $this->entityTypeManager
+        ->getHandler($entity->getEntityTypeId(), 'moderation')
+        ->onPresave($entity, $update_default_revision, $current_state->isPublishedState());
     }
   }
 
   /**
-   * Hook bridge.
-   *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity that was just saved.
    *
@@ -128,13 +135,10 @@ class EntityOperations implements ContainerInjectionInterface {
   public function entityInsert(EntityInterface $entity) {
     if ($this->moderationInfo->isModeratedEntity($entity)) {
       $this->updateOrCreateFromEntity($entity);
-      $this->setLatestRevision($entity);
     }
   }
 
   /**
-   * Hook bridge.
-   *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity that was just saved.
    *
@@ -143,7 +147,12 @@ class EntityOperations implements ContainerInjectionInterface {
   public function entityUpdate(EntityInterface $entity) {
     if ($this->moderationInfo->isModeratedEntity($entity)) {
       $this->updateOrCreateFromEntity($entity);
-      $this->setLatestRevision($entity);
+    }
+    // When updating workflow settings for Content Moderation, we need to
+    // rebuild routes as we may be enabling new entity types and the related
+    // entity forms.
+    elseif ($entity instanceof Workflow && $entity->getTypePlugin()->getPluginId() == 'content_moderation') {
+      $this->routerBuilder->setRebuildNeeded();
     }
   }
 
@@ -154,39 +163,23 @@ class EntityOperations implements ContainerInjectionInterface {
    *   The entity to update or create a moderation state for.
    */
   protected function updateOrCreateFromEntity(EntityInterface $entity) {
-    $moderation_state = $entity->moderation_state->value;
-    $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    if (!$moderation_state) {
-      $moderation_state = $workflow->getTypePlugin()->getInitialState($workflow, $entity)->id();
-    }
-
-    // @todo what if $entity->moderation_state is null at this point?
-    $entity_type_id = $entity->getEntityTypeId();
-    $entity_id = $entity->id();
     $entity_revision_id = $entity->getRevisionId();
-
+    $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
+    $content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity);
+    /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
     $storage = $this->entityTypeManager->getStorage('content_moderation_state');
-    $entities = $storage->loadByProperties([
-      'content_entity_type_id' => $entity_type_id,
-      'content_entity_id' => $entity_id,
-      'workflow' => $workflow->id(),
-    ]);
 
-    /** @var \Drupal\content_moderation\ContentModerationStateInterface $content_moderation_state */
-    $content_moderation_state = reset($entities);
     if (!($content_moderation_state instanceof ContentModerationStateInterface)) {
       $content_moderation_state = $storage->create([
-        'content_entity_type_id' => $entity_type_id,
-        'content_entity_id' => $entity_id,
+        'content_entity_type_id' => $entity->getEntityTypeId(),
+        'content_entity_id' => $entity->id(),
+        // Make sure that the moderation state entity has the same language code
+        // as the moderated entity.
+        'langcode' => $entity->language()->getId(),
       ]);
       $content_moderation_state->workflow->target_id = $workflow->id();
     }
-    elseif ($content_moderation_state->content_entity_revision_id->value != $entity_revision_id) {
-      // If a new revision of the content has been created, add a new content
-      // moderation state revision.
-      $content_moderation_state->setNewRevision(TRUE);
-    }
 
     // Sync translations.
     if ($entity->getEntityType()->hasKey('langcode')) {
@@ -199,86 +192,127 @@ class EntityOperations implements ContainerInjectionInterface {
       }
     }
 
+    // If a new revision of the content has been created, add a new content
+    // moderation state revision.
+    if (!$content_moderation_state->isNew() && $content_moderation_state->content_entity_revision_id->value != $entity_revision_id) {
+      $content_moderation_state = $storage->createRevision($content_moderation_state, $entity->isDefaultRevision());
+    }
+
     // Create the ContentModerationState entity for the inserted entity.
+    $moderation_state = $entity->moderation_state->value;
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    if (!$moderation_state) {
+      $moderation_state = $workflow->getTypePlugin()->getInitialState($entity)->id();
+    }
+
     $content_moderation_state->set('content_entity_revision_id', $entity_revision_id);
     $content_moderation_state->set('moderation_state', $moderation_state);
     ContentModerationStateEntity::updateOrCreateFromEntity($content_moderation_state);
   }
 
   /**
-   * Set the latest revision.
-   *
    * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The content entity to create content_moderation_state entity for.
+   *   The entity being deleted.
+   *
+   * @see hook_entity_delete()
    */
-  protected function setLatestRevision(EntityInterface $entity) {
+  public function entityDelete(EntityInterface $entity) {
+    $content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity);
+    if ($content_moderation_state) {
+      $content_moderation_state->delete();
+    }
+  }
+
+  /**
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity revision being deleted.
+   *
+   * @see hook_entity_revision_delete()
+   */
+  public function entityRevisionDelete(EntityInterface $entity) {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $this->tracker->setLatestRevision(
-      $entity->getEntityTypeId(),
-      $entity->id(),
-      $entity->language()->getId(),
-      $entity->getRevisionId()
-    );
+    if (!$entity->isDefaultRevision()) {
+      $content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity);
+      if ($content_moderation_state) {
+        $this->entityTypeManager
+          ->getStorage('content_moderation_state')
+          ->deleteRevision($content_moderation_state->getRevisionId());
+      }
+    }
+  }
+
+  /**
+   * @param \Drupal\Core\Entity\EntityInterface $translation
+   *   The entity translation being deleted.
+   *
+   * @see hook_entity_translation_delete()
+   */
+  public function entityTranslationDelete(EntityInterface $translation) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $translation */
+    if (!$translation->isDefaultTranslation()) {
+      $langcode = $translation->language()->getId();
+      $content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($translation);
+      if ($content_moderation_state && $content_moderation_state->hasTranslation($langcode)) {
+        $content_moderation_state->removeTranslation($langcode);
+        ContentModerationStateEntity::updateOrCreateFromEntity($content_moderation_state);
+      }
+    }
   }
 
   /**
    * Act on entities being assembled before rendering.
    *
-   * This is a hook bridge.
-   *
    * @see hook_entity_view()
    * @see EntityFieldManagerInterface::getExtraFields()
    */
   public function entityView(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     if (!$this->moderationInfo->isModeratedEntity($entity)) {
       return;
     }
-    if (!$this->moderationInfo->isLatestRevision($entity)) {
+    if (isset($entity->in_preview) && $entity->in_preview) {
       return;
     }
-    if ($this->moderationInfo->isLiveRevision($entity)) {
+    // If the component is not defined for this display, we have nothing to do.
+    if (!$display->getComponent('content_moderation_control')) {
+      return;
+    }
+    // The moderation form should be displayed only when viewing the latest
+    // (translation-affecting) revision, unless it was created as published
+    // default revision.
+    if (($entity->isDefaultRevision() || $entity->wasDefaultRevision()) && $this->isPublished($entity)) {
+      return;
+    }
+    if (!$entity->isLatestRevision() && !$entity->isLatestTranslationAffectedRevision()) {
       return;
     }
 
-    $component = $display->getComponent('content_moderation_control');
-    if ($component) {
-      $build['content_moderation_control'] = $this->formBuilder->getForm(EntityModerationForm::class, $entity);
-      $build['content_moderation_control']['#weight'] = $component['weight'];
-    }
+    $build['content_moderation_control'] = $this->formBuilder->getForm(EntityModerationForm::class, $entity);
   }
 
   /**
-   * Check if the default revision for the given entity is published.
+   * Checks if the entity is published.
    *
-   * The default revision is the same as the entity retrieved by "default" from
-   * the storage handler. If the entity is translated, check if any of the
-   * translations are published.
+   * This method is optimized to not have to unnecessarily load the moderation
+   * state and workflow if it is not required.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity being saved.
-   * @param \Drupal\workflows\WorkflowInterface $workflow
-   *   The workflow being applied to the entity.
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity to check.
    *
    * @return bool
-   *   TRUE if the default revision is published. FALSE otherwise.
+   *   TRUE if the entity is published, FALSE otherwise.
    */
-  protected function isDefaultRevisionPublished(EntityInterface $entity, WorkflowInterface $workflow) {
-    $default_revision = $this->entityTypeManager->getStorage($entity->getEntityTypeId())->load($entity->id());
-
-    // Ensure we are checking all translations of the default revision.
-    if ($default_revision instanceof TranslatableInterface && $default_revision->isTranslatable()) {
-      // Loop through each language that has a translation.
-      foreach ($default_revision->getTranslationLanguages() as $language) {
-        // Load the translated revision.
-        $language_revision = $default_revision->getTranslation($language->getId());
-        // Return TRUE if a translation with a published state is found.
-        if ($workflow->getState($language_revision->moderation_state->value)->isPublishedState()) {
-          return TRUE;
-        }
-      }
+  protected function isPublished(ContentEntityInterface $entity) {
+    // If the entity implements EntityPublishedInterface directly, check that
+    // first, otherwise fall back to check through the workflow state.
+    if ($entity instanceof EntityPublishedInterface) {
+      return $entity->isPublished();
     }
-
-    return $workflow->getState($default_revision->moderation_state->value)->isPublishedState();
+    if ($moderation_state = $entity->get('moderation_state')->value) {
+      $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
+      return $workflow->getTypePlugin()->getState($moderation_state)->isPublishedState();
+    }
+    return FALSE;
   }
 
 }

web/core/modules/content_moderation/src/EntityTypeInfo.php

@@ -3,7 +3,6 @@
 namespace Drupal\content_moderation;
 
 use Drupal\content_moderation\Plugin\Field\ModerationStateFieldItemList;
-use Drupal\Core\Config\Entity\ConfigEntityTypeInterface;
 use Drupal\Core\Entity\BundleEntityFormBase;
 use Drupal\Core\Entity\ContentEntityFormInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
@@ -13,17 +12,15 @@ use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Form\FormInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\Url;
 use Drupal\content_moderation\Entity\Handler\BlockContentModerationHandler;
 use Drupal\content_moderation\Entity\Handler\ModerationHandler;
 use Drupal\content_moderation\Entity\Handler\NodeModerationHandler;
-use Drupal\content_moderation\Form\BundleModerationConfigurationForm;
-use Drupal\content_moderation\Routing\EntityModerationRouteProvider;
-use Drupal\content_moderation\Routing\EntityTypeModerationRouteProvider;
+use Drupal\content_moderation\Entity\Routing\EntityModerationRouteProvider;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -31,6 +28,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  *
  * This class contains primarily bridged hooks for compile-time or
  * cache-clear-time hooks. Runtime hooks should be placed in EntityOperations.
+ *
+ * @internal
  */
 class EntityTypeInfo implements ContainerInjectionInterface {
 
@@ -64,6 +63,13 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    */
   protected $currentUser;
 
+  /**
+   * The state transition validation service.
+   *
+   * @var \Drupal\content_moderation\StateTransitionValidationInterface
+   */
+  protected $validator;
+
   /**
    * A keyed array of custom moderation handlers for given entity types.
    *
@@ -90,12 +96,13 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   Current user.
    */
-  public function __construct(TranslationInterface $translation, ModerationInformationInterface $moderation_information, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_info, AccountInterface $current_user) {
+  public function __construct(TranslationInterface $translation, ModerationInformationInterface $moderation_information, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_info, AccountInterface $current_user, StateTransitionValidationInterface $validator) {
     $this->stringTranslation = $translation;
     $this->moderationInfo = $moderation_information;
     $this->entityTypeManager = $entity_type_manager;
     $this->bundleInfo = $bundle_info;
     $this->currentUser = $current_user;
+    $this->validator = $validator;
   }
 
   /**
@@ -107,17 +114,15 @@ class EntityTypeInfo implements ContainerInjectionInterface {
       $container->get('content_moderation.moderation_information'),
       $container->get('entity_type.manager'),
       $container->get('entity_type.bundle.info'),
-      $container->get('current_user')
+      $container->get('current_user'),
+      $container->get('content_moderation.state_transition_validation')
     );
   }
 
-
   /**
    * Adds Moderation configuration to appropriate entity types.
    *
-   * This is an alter hook bridge.
-   *
-   * @param EntityTypeInterface[] $entity_types
+   * @param \Drupal\Core\Entity\EntityTypeInterface[] $entity_types
    *   The master entity type list to alter.
    *
    * @see hook_entity_type_alter()
@@ -125,13 +130,8 @@ class EntityTypeInfo implements ContainerInjectionInterface {
   public function entityTypeAlter(array &$entity_types) {
     foreach ($entity_types as $entity_type_id => $entity_type) {
       // The ContentModerationState entity type should never be moderated.
-      if ($entity_type->isRevisionable() && $entity_type_id != 'content_moderation_state') {
+      if ($entity_type->isRevisionable() && !$entity_type->isInternal()) {
         $entity_types[$entity_type_id] = $this->addModerationToEntityType($entity_type);
-        // Add additional moderation support to entity types whose bundles are
-        // managed by a config entity type.
-        if ($entity_type->getBundleEntityType()) {
-          $entity_types[$entity_type->getBundleEntityType()] = $this->addModerationToBundleEntityType($entity_types[$entity_type->getBundleEntityType()]);
-        }
       }
     }
   }
@@ -158,8 +158,6 @@ class EntityTypeInfo implements ContainerInjectionInterface {
       $type->setLinkTemplate('latest-version', $type->getLinkTemplate('canonical') . '/latest');
     }
 
-    // @todo Core forgot to add a direct way to manipulate route_provider, so
-    // we have to do it the sloppy way for now.
     $providers = $type->getRouteProviderClasses() ?: [];
     if (empty($providers['moderation'])) {
       $providers['moderation'] = EntityModerationRouteProvider::class;
@@ -169,74 +167,9 @@ class EntityTypeInfo implements ContainerInjectionInterface {
     return $type;
   }
 
-  /**
-   * Configures moderation configuration support on a entity type definition.
-   *
-   * That "configuration support" includes a configuration form, a hypermedia
-   * link, and a route provider to tie it all together. There's also a
-   * moderation handler for per-entity-type variation.
-   *
-   * @param \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $type
-   *   The config entity definition to modify.
-   *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityTypeInterface
-   *   The modified config entity definition.
-   */
-  protected function addModerationToBundleEntityType(ConfigEntityTypeInterface $type) {
-    if ($type->hasLinkTemplate('edit-form') && !$type->hasLinkTemplate('moderation-form')) {
-      $type->setLinkTemplate('moderation-form', $type->getLinkTemplate('edit-form') . '/moderation');
-    }
-
-    if (!$type->getFormClass('moderation')) {
-      $type->setFormClass('moderation', BundleModerationConfigurationForm::class);
-    }
-
-    // @todo Core forgot to add a direct way to manipulate route_provider, so
-    // we have to do it the sloppy way for now.
-    $providers = $type->getRouteProviderClasses() ?: [];
-    if (empty($providers['moderation'])) {
-      $providers['moderation'] = EntityTypeModerationRouteProvider::class;
-      $type->setHandlerClass('route_provider', $providers);
-    }
-
-    return $type;
-  }
-
-  /**
-   * Adds an operation on bundles that should have a Moderation form.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity on which to define an operation.
-   *
-   * @return array
-   *   An array of operation definitions.
-   *
-   * @see hook_entity_operation()
-   */
-  public function entityOperation(EntityInterface $entity) {
-    $operations = [];
-    $type = $entity->getEntityType();
-    $bundle_of = $type->getBundleOf();
-    if ($this->currentUser->hasPermission('administer content moderation') && $bundle_of &&
-      $this->moderationInfo->canModerateEntitiesOfEntityType($this->entityTypeManager->getDefinition($bundle_of))
-    ) {
-      $operations['manage-moderation'] = [
-        'title' => t('Manage moderation'),
-        'weight' => 27,
-        'url' => Url::fromRoute("entity.{$type->id()}.moderation", [$entity->getEntityTypeId() => $entity->id()]),
-      ];
-    }
-
-    return $operations;
-  }
-
   /**
    * Gets the "extra fields" for a bundle.
    *
-   * This is a hook bridge.
-   *
-   * @see hook_entity_extra_field_info()
-   *
    * @return array
    *   A nested array of 'pseudo-field' elements. Each list is nested within the
    *   following keys: entity type, bundle name, context (either 'form' or
@@ -255,6 +188,8 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    *   - delete: (optional) String containing markup (normally a link) used as
    *     the element's 'delete' operation in the administration interface. Only
    *     for 'form' context.
+   *
+   * @see hook_entity_extra_field_info()
    */
   public function entityExtraFieldInfo() {
     $return = [];
@@ -301,6 +236,8 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    *
    * @return \Drupal\Core\Field\BaseFieldDefinition[]
    *   New fields added by moderation state.
+   *
+   * @see hook_entity_base_field_info()
    */
   public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
     if (!$this->moderationInfo->canModerateEntitiesOfEntityType($entity_type)) {
@@ -313,7 +250,6 @@ class EntityTypeInfo implements ContainerInjectionInterface {
       ->setDescription(t('The moderation state of this piece of content.'))
       ->setComputed(TRUE)
       ->setClass(ModerationStateFieldItemList::class)
-      ->setSetting('target_type', 'moderation_state')
       ->setDisplayOptions('view', [
         'label' => 'hidden',
         'region' => 'hidden',
@@ -321,11 +257,11 @@ class EntityTypeInfo implements ContainerInjectionInterface {
       ])
       ->setDisplayOptions('form', [
         'type' => 'moderation_state_default',
-        'weight' => 5,
+        'weight' => 100,
         'settings' => [],
       ])
       ->addConstraint('ModerationState', [])
-      ->setDisplayConfigurable('form', FALSE)
+      ->setDisplayConfigurable('form', TRUE)
       ->setDisplayConfigurable('view', FALSE)
       ->setReadOnly(FALSE)
       ->setTranslatable(TRUE);
@@ -333,6 +269,40 @@ class EntityTypeInfo implements ContainerInjectionInterface {
     return $fields;
   }
 
+  /**
+   * Replaces the entity form entity object with a proper revision object.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity being edited.
+   * @param string $operation
+   *   The entity form operation.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state.
+   *
+   * @see hook_entity_prepare_form()
+   */
+  public function entityPrepareForm(EntityInterface $entity, $operation, FormStateInterface $form_state) {
+    /** @var \Drupal\Core\Entity\EntityFormInterface $form_object */
+    $form_object = $form_state->getFormObject();
+
+    if ($this->isModeratedEntityEditForm($form_object) && !$entity->isNew()) {
+      // Generate a proper revision object for the current entity. This allows
+      // to correctly handle translatable entities having pending revisions.
+      /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
+      $storage = $this->entityTypeManager->getStorage($entity->getEntityTypeId());
+      /** @var \Drupal\Core\Entity\ContentEntityInterface $new_revision */
+      $new_revision = $storage->createRevision($entity, FALSE);
+
+      // Restore the revision ID as other modules may expect to find it still
+      // populated. This will reset the "new revision" flag, however the entity
+      // object will be marked as a new revision again on submit.
+      // @see \Drupal\Core\Entity\ContentEntityForm::buildEntity()
+      $revision_key = $new_revision->getEntityType()->getKey('revision');
+      $new_revision->set($revision_key, $new_revision->getLoadedRevisionId());
+      $form_object->setEntity($new_revision);
+    }
+  }
+
   /**
    * Alters bundle forms to enforce revision handling.
    *
@@ -348,25 +318,58 @@ class EntityTypeInfo implements ContainerInjectionInterface {
   public function formAlter(array &$form, FormStateInterface $form_state, $form_id) {
     $form_object = $form_state->getFormObject();
     if ($form_object instanceof BundleEntityFormBase) {
-      $type = $form_object->getEntity()->getEntityType();
-      if ($this->moderationInfo->canModerateEntitiesOfEntityType($type)) {
-        $this->entityTypeManager->getHandler($type->getBundleOf(), 'moderation')->enforceRevisionsBundleFormAlter($form, $form_state, $form_id);
+      $config_entity_type = $form_object->getEntity()->getEntityType();
+      $bundle_of = $config_entity_type->getBundleOf();
+      if ($bundle_of
+          && ($bundle_of_entity_type = $this->entityTypeManager->getDefinition($bundle_of))
+          && $this->moderationInfo->canModerateEntitiesOfEntityType($bundle_of_entity_type)) {
+        $this->entityTypeManager->getHandler($config_entity_type->getBundleOf(), 'moderation')->enforceRevisionsBundleFormAlter($form, $form_state, $form_id);
       }
     }
-    elseif ($form_object instanceof ContentEntityFormInterface) {
+    elseif ($this->isModeratedEntityEditForm($form_object)) {
+      /** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
+      /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
       $entity = $form_object->getEntity();
       if ($this->moderationInfo->isModeratedEntity($entity)) {
         $this->entityTypeManager
           ->getHandler($entity->getEntityTypeId(), 'moderation')
           ->enforceRevisionsEntityFormAlter($form, $form_state, $form_id);
+
         // Submit handler to redirect to the latest version, if available.
         $form['actions']['submit']['#submit'][] = [EntityTypeInfo::class, 'bundleFormRedirect'];
+
+        // Move the 'moderation_state' field widget to the footer region, if
+        // available.
+        if (isset($form['footer'])) {
+          $form['moderation_state']['#group'] = 'footer';
+        }
+
+        // If the publishing status exists in the meta region, replace it with
+        // the current state instead.
+        if (isset($form['meta']['published'])) {
+          $form['meta']['published']['#markup'] = $this->moderationInfo->getWorkflowForEntity($entity)->getTypePlugin()->getState($entity->moderation_state->value)->label();
+        }
       }
     }
   }
 
   /**
-   * Redirect content entity edit forms on save, if there is a forward revision.
+   * Checks whether the specified form allows to edit a moderated entity.
+   *
+   * @param \Drupal\Core\Form\FormInterface $form_object
+   *   The form object.
+   *
+   * @return bool
+   *   TRUE if the form should get form moderation, FALSE otherwise.
+   */
+  protected function isModeratedEntityEditForm(FormInterface $form_object) {
+    return $form_object instanceof ContentEntityFormInterface &&
+      in_array($form_object->getOperation(), ['edit', 'default'], TRUE) &&
+      $this->moderationInfo->isModeratedEntity($form_object->getEntity());
+  }
+
+  /**
+   * Redirect content entity edit forms on save, if there is a pending revision.
    *
    * When saving their changes, editors should see those changes displayed on
    * the next page.
@@ -381,7 +384,7 @@ class EntityTypeInfo implements ContainerInjectionInterface {
     $entity = $form_state->getFormObject()->getEntity();
 
     $moderation_info = \Drupal::getContainer()->get('content_moderation.moderation_information');
-    if ($moderation_info->hasForwardRevision($entity) && $entity->hasLinkTemplate('latest-version')) {
+    if ($moderation_info->hasPendingRevision($entity) && $entity->hasLinkTemplate('latest-version')) {
       $entity_type_id = $entity->getEntityTypeId();
       $form_state->setRedirect("entity.$entity_type_id.latest_version", [$entity_type_id => $entity->id()]);
     }

web/core/modules/content_moderation/src/EventSubscriber/ConfigImportSubscriber.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Drupal\content_moderation\EventSubscriber;
+
+use Drupal\Core\Config\ConfigImporterEvent;
+use Drupal\Core\Config\ConfigImportValidateEventSubscriberBase;
+use Drupal\Core\Config\ConfigManagerInterface;
+use Drupal\Core\Config\Entity\ConfigEntityStorage;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+
+/**
+ * Check moderation states are not being used before updating workflow config.
+ */
+class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
+
+  /**
+   * The config manager.
+   *
+   * @var \Drupal\Core\Config\ConfigManagerInterface
+   */
+  protected $configManager;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs the event subscriber.
+   *
+   * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
+   *   The config manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(ConfigManagerInterface $config_manager, EntityTypeManagerInterface $entity_type_manager) {
+    $this->configManager = $config_manager;
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function onConfigImporterValidate(ConfigImporterEvent $event) {
+    foreach (['update', 'delete'] as $op) {
+      $unprocessed_configurations = $event->getConfigImporter()->getUnprocessedConfiguration($op);
+      foreach ($unprocessed_configurations as $unprocessed_configuration) {
+        if ($workflow = $this->getWorkflow($unprocessed_configuration)) {
+          if ($op === 'update') {
+            $original_workflow_config = $event->getConfigImporter()
+              ->getStorageComparer()
+              ->getSourceStorage()
+              ->read($unprocessed_configuration);
+            $workflow_config = $event->getConfigImporter()
+              ->getStorageComparer()
+              ->getTargetStorage()
+              ->read($unprocessed_configuration);
+            $diff = array_diff_key($workflow_config['type_settings']['states'], $original_workflow_config['type_settings']['states']);
+            foreach (array_keys($diff) as $state_id) {
+              $state = $workflow->getTypePlugin()->getState($state_id);
+              if ($workflow->getTypePlugin()->workflowStateHasData($workflow, $state)) {
+                $event->getConfigImporter()->logError($this->t('The moderation state @state_label is being used, but is not in the source storage.', ['@state_label' => $state->label()]));
+              }
+            }
+          }
+          if ($op === 'delete') {
+            if ($workflow->getTypePlugin()->workflowHasData($workflow)) {
+              $event->getConfigImporter()->logError($this->t('The workflow @workflow_label is being used, and cannot be deleted.', ['@workflow_label' => $workflow->label()]));
+            }
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Get the workflow entity object from the configuration name.
+   *
+   * @param string $config_name
+   *   The configuration object name.
+   *
+   * @return \Drupal\workflows\WorkflowInterface|null
+   *   A workflow entity object. NULL if no matching entity is found.
+   */
+  protected function getWorkflow($config_name) {
+    $entity_type_id = $this->configManager->getEntityTypeIdByName($config_name);
+    if ($entity_type_id !== 'workflow') {
+      return;
+    }
+
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $entity_type */
+    $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
+    $entity_id = ConfigEntityStorage::getIDFromConfigName($config_name, $entity_type->getConfigPrefix());
+    return $this->entityTypeManager->getStorage($entity_type_id)->load($entity_id);
+  }
+
+}

web/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php

@@ -1,155 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Form;
-
-use Drupal\content_moderation\Plugin\WorkflowType\ContentModeration;
-use Drupal\workflows\WorkflowInterface;
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Form for configuring moderation usage on a given entity bundle.
- */
-class BundleModerationConfigurationForm extends EntityForm {
-
-  /**
-   * Entity Type Manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('entity_type.manager'));
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Blank out the base form ID so that form alters that use the base form ID to
-   * target both add and edit forms don't pick up this form.
-   */
-  public function getBaseFormId() {
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    /* @var \Drupal\Core\Config\Entity\ConfigEntityInterface $bundle */
-    $bundle = $this->getEntity();
-    $bundle_of_entity_type = $this->entityTypeManager->getDefinition($bundle->getEntityType()->getBundleOf());
-    /* @var \Drupal\workflows\WorkflowInterface[] $workflows */
-    $workflows = $this->entityTypeManager->getStorage('workflow')->loadMultiple();
-
-    $options = array_map(function (WorkflowInterface $workflow) {
-      return $workflow->label();
-    }, array_filter($workflows, function (WorkflowInterface $workflow) {
-      return $workflow->status() && $workflow->getTypePlugin() instanceof ContentModeration;
-    }));
-
-    $selected_workflow = array_reduce($workflows, function ($carry, WorkflowInterface $workflow) use ($bundle_of_entity_type, $bundle) {
-      $plugin = $workflow->getTypePlugin();
-      if ($plugin instanceof ContentModeration && $plugin->appliesToEntityTypeAndBundle($bundle_of_entity_type->id(), $bundle->id())) {
-        return $workflow->id();
-      }
-      return $carry;
-    });
-    $form['workflow'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Select the workflow to apply'),
-      '#default_value' => $selected_workflow,
-      '#options' => $options,
-      '#required' => FALSE,
-      '#empty_value' => '',
-    ];
-
-    $form['original_workflow'] = [
-      '#type' => 'value',
-      '#value' => $selected_workflow,
-    ];
-
-    $form['bundle'] = [
-      '#type' => 'value',
-      '#value' => $bundle->id(),
-    ];
-
-    $form['entity_type'] = [
-      '#type' => 'value',
-      '#value' => $bundle_of_entity_type->id(),
-    ];
-
-    // Add a special message when moderation is being disabled.
-    if ($selected_workflow) {
-      $form['enable_workflow_note'] = [
-        '#type' => 'item',
-        '#description' => $this->t('After disabling moderation, any existing forward drafts will be accessible via the "Revisions" tab.'),
-        '#access' => !empty($selected_workflow)
-      ];
-    }
-
-    return parent::form($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // If moderation is enabled, revisions MUST be enabled as well. Otherwise we
-    // can't have forward revisions.
-    drupal_set_message($this->t('Your settings have been saved.'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $entity_type_id = $form_state->getValue('entity_type');
-    $bundle_id = $form_state->getValue('bundle');
-    $new_workflow_id = $form_state->getValue('workflow');
-    $original_workflow_id = $form_state->getValue('original_workflow');
-    if ($new_workflow_id === $original_workflow_id) {
-      // Nothing to do.
-      return;
-    }
-    if ($original_workflow_id) {
-      /* @var \Drupal\workflows\WorkflowInterface $workflow */
-      $workflow = $this->entityTypeManager->getStorage('workflow')->load($original_workflow_id);
-      $workflow->getTypePlugin()->removeEntityTypeAndBundle($entity_type_id, $bundle_id);
-      $workflow->save();
-    }
-    if ($new_workflow_id) {
-      /* @var \Drupal\workflows\WorkflowInterface $workflow */
-      $workflow = $this->entityTypeManager->getStorage('workflow')->load($new_workflow_id);
-      $workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, $bundle_id);
-      $workflow->save();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#submit' => ['::submitForm', '::save'],
-    ];
-
-    return $actions;
-  }
-
-}

web/core/modules/content_moderation/src/Form/ContentModerationConfigureEntityTypesForm.php

@@ -0,0 +1,232 @@
+<?php
+
+namespace Drupal\content_moderation\Form;
+
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\content_moderation\ModerationInformationInterface;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\CloseDialogCommand;
+use Drupal\Core\Ajax\HtmlCommand;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\workflows\WorkflowInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * The form for editing entity types associated with a workflow.
+ *
+ * @internal
+ */
+class ContentModerationConfigureEntityTypesForm extends FormBase {
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The entity type bundle information service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
+  /**
+   * The moderation information service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInformation;
+
+  /**
+   * The workflow entity object.
+   *
+   * @var \Drupal\workflows\WorkflowInterface
+   */
+  protected $workflow;
+
+  /**
+   * The entity type definition object.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface
+   */
+  protected $entityType;
+
+  /**
+   * The Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity_type.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('content_moderation.moderation_information'),
+      $container->get('messenger')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_info, ModerationInformationInterface $moderation_information, MessengerInterface $messenger) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->bundleInfo = $bundle_info;
+    $this->moderationInformation = $moderation_information;
+    $this->messenger = $messenger;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_type_edit_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, WorkflowInterface $workflow = NULL, $entity_type_id = NULL) {
+    $this->workflow = $workflow;
+    try {
+      $this->entityType = $this->entityTypeManager->getDefinition($entity_type_id);
+    }
+    catch (PluginNotFoundException $e) {
+      throw new NotFoundHttpException();
+    }
+
+    $options = $defaults = [];
+    foreach ($this->bundleInfo->getBundleInfo($this->entityType->id()) as $bundle_id => $bundle) {
+      // Check if moderation is enabled for this bundle on any workflow.
+      $moderation_enabled = $this->moderationInformation->shouldModerateEntitiesOfBundle($this->entityType, $bundle_id);
+      // Check if moderation is enabled for this bundle on this workflow.
+      $workflow_moderation_enabled = $this->workflow->getTypePlugin()->appliesToEntityTypeAndBundle($this->entityType->id(), $bundle_id);
+      // Only show bundles that are not enabled anywhere, or enabled on this
+      // workflow.
+      if (!$moderation_enabled || $workflow_moderation_enabled) {
+        // Add the bundle to the options if it's not enabled on a workflow,
+        // unless the workflow it's enabled on is this one.
+        $options[$bundle_id] = [
+          'title' => ['data' => ['#title' => $bundle['label']]],
+          'type' => $bundle['label'],
+        ];
+        // Add the bundle to the list of default values if it's enabled on this
+        // workflow.
+        $defaults[$bundle_id] = $workflow_moderation_enabled;
+      }
+    }
+
+    if (!empty($options)) {
+      $bundles_header = $this->t('All @entity_type types', ['@entity_type' => $this->entityType->getLabel()]);
+      if ($bundle_entity_type_id = $this->entityType->getBundleEntityType()) {
+        $bundles_header = $this->t('All @entity_type_plural_label', ['@entity_type_plural_label' => $this->entityTypeManager->getDefinition($bundle_entity_type_id)->getPluralLabel()]);
+      }
+      $form['bundles'] = [
+        '#type' => 'tableselect',
+        '#header' => [
+          'type' => $bundles_header,
+        ],
+        '#options' => $options,
+        '#default_value' => $defaults,
+        '#attributes' => ['class' => ['no-highlight']],
+      ];
+    }
+
+    // Get unsupported features for this entity type.
+    $warnings = $this->moderationInformation->getUnsupportedFeatures($this->entityType);
+    // Display message into the Ajax form returned.
+    if ($this->getRequest()->get(MainContentViewSubscriber::WRAPPER_FORMAT) == 'drupal_modal' && !empty($warnings)) {
+      $form['warnings'] = ['#type' => 'status_messages', '#weight' => -1];
+    }
+    // Set warning message.
+    foreach ($warnings as $warning) {
+      $this->messenger->addWarning($warning);
+    }
+
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#button_type' => 'primary',
+      '#value' => $this->t('Save'),
+      '#ajax' => [
+        'callback' => [$this, 'ajaxcallback'],
+      ],
+    ];
+    $form['actions']['cancel'] = [
+      '#type' => 'button',
+      '#value' => $this->t('Cancel'),
+      '#ajax' => [
+        'callback' => [$this, 'ajaxcallback'],
+      ],
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    foreach ($form_state->getValue('bundles') as $bundle_id => $checked) {
+      if ($checked) {
+        $this->workflow->getTypePlugin()->addEntityTypeAndBundle($this->entityType->id(), $bundle_id);
+      }
+      else {
+        $this->workflow->getTypePlugin()->removeEntityTypeAndBundle($this->entityType->id(), $bundle_id);
+      }
+    }
+    $this->workflow->save();
+  }
+
+  /**
+   * Ajax callback to close the modal and update the selected text.
+   *
+   * @return \Drupal\Core\Ajax\AjaxResponse
+   *   An ajax response object.
+   */
+  public function ajaxCallback() {
+    $selected_bundles = [];
+    foreach ($this->bundleInfo->getBundleInfo($this->entityType->id()) as $bundle_id => $bundle) {
+      if ($this->workflow->getTypePlugin()->appliesToEntityTypeAndBundle($this->entityType->id(), $bundle_id)) {
+        $selected_bundles[$bundle_id] = $bundle['label'];
+      }
+    }
+    $selected_bundles_list = [
+      '#theme' => 'item_list',
+      '#items' => $selected_bundles,
+      '#context' => ['list_style' => 'comma-list'],
+      '#empty' => $this->t('none'),
+    ];
+    $response = new AjaxResponse();
+    $response->addCommand(new CloseDialogCommand());
+    $response->addCommand(new HtmlCommand('#selected-' . $this->entityType->id(), $selected_bundles_list));
+    return $response;
+  }
+
+  /**
+   * Route title callback.
+   */
+  public function getTitle(WorkflowInterface $workflow = NULL, $entity_type_id) {
+    $this->entityType = $this->entityTypeManager->getDefinition($entity_type_id);
+
+    $title = $this->t('Select the @entity_type types for the @workflow workflow', ['@entity_type' => $this->entityType->getLabel(), '@workflow' => $workflow->label()]);
+    if ($bundle_entity_type_id = $this->entityType->getBundleEntityType()) {
+      $title = $this->t('Select the @entity_type_plural_label for the @workflow workflow', ['@entity_type_plural_label' => $this->entityTypeManager->getDefinition($bundle_entity_type_id)->getPluralLabel(), '@workflow' => $workflow->label()]);
+    }
+
+    return $title;
+  }
+
+}

web/core/modules/content_moderation/src/Form/ContentModerationConfigureForm.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace Drupal\content_moderation\Form;
+
+use Drupal\Component\Serialization\Json;
+use Drupal\content_moderation\ModerationInformationInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\workflows\Plugin\WorkflowTypeConfigureFormBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * The content moderation WorkflowType configuration form.
+ *
+ * @see \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration
+ */
+class ContentModerationConfigureForm extends WorkflowTypeConfigureFormBase implements ContainerInjectionInterface {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The moderation info service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInfo;
+
+  /**
+   * The entity type type bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $entityTypeBundleInfo;
+
+  /**
+   * Create an instance of ContentModerationConfigureForm.
+   */
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, ModerationInformationInterface $moderationInformation, EntityTypeBundleInfoInterface $entityTypeBundleInfo) {
+    $this->entityTypeManager = $entityTypeManager;
+    $this->moderationInfo = $moderationInformation;
+    $this->entityTypeBundleInfo = $entityTypeBundleInfo;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity_type.manager'),
+      $container->get('content_moderation.moderation_information'),
+      $container->get('entity_type.bundle.info')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    $workflow = $form_state->getFormObject()->getEntity();
+
+    $header = [
+      'type' => $this->t('Items'),
+      'operations' => $this->t('Operations'),
+    ];
+    $form['entity_types_container'] = [
+      '#type' => 'details',
+      '#title' => $this->t('This workflow applies to:'),
+      '#open' => TRUE,
+    ];
+    $form['entity_types_container']['entity_types'] = [
+      '#type' => 'table',
+      '#header' => $header,
+      '#empty' => $this->t('There are no entity types.'),
+    ];
+
+    $entity_types = $this->entityTypeManager->getDefinitions();
+    foreach ($entity_types as $entity_type) {
+      if (!$this->moderationInfo->canModerateEntitiesOfEntityType($entity_type)) {
+        continue;
+      }
+
+      $selected_bundles = [];
+      foreach ($this->entityTypeBundleInfo->getBundleInfo($entity_type->id()) as $bundle_id => $bundle) {
+        if ($this->workflowType->appliesToEntityTypeAndBundle($entity_type->id(), $bundle_id)) {
+          $selected_bundles[$bundle_id] = $bundle['label'];
+        }
+      }
+
+      $selected_bundles_list = [
+        '#theme' => 'item_list',
+        '#items' => $selected_bundles,
+        '#context' => ['list_style' => 'comma-list'],
+        '#empty' => $this->t('none'),
+      ];
+      $form['entity_types_container']['entity_types'][$entity_type->id()] = [
+        'type' => [
+          '#type' => 'inline_template',
+          '#template' => '<strong>{{ label }}</strong></br><span id="selected-{{ entity_type_id }}">{{ selected_bundles }}</span>',
+          '#context' => [
+            'label' => $this->t('@bundle types', ['@bundle' => $entity_type->getLabel()]),
+            'entity_type_id' => $entity_type->id(),
+            'selected_bundles' => $selected_bundles_list,
+          ],
+        ],
+        'operations' => [
+          '#type' => 'operations',
+          '#links' => [
+            'select' => [
+              'title' => $this->t('Select'),
+              'url' => Url::fromRoute('content_moderation.workflow_type_edit_form', ['workflow' => $workflow->id(), 'entity_type_id' => $entity_type->id()]),
+              'attributes' => [
+                'class' => ['use-ajax'],
+                'data-dialog-type' => 'modal',
+                'data-dialog-options' => Json::encode([
+                  'width' => 700,
+                ]),
+              ],
+            ],
+          ],
+        ],
+      ];
+    }
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
+    // Configuration is updated from modal windows launched from this form, no
+    // need to change any configuration here.
+  }
+
+}

web/core/modules/content_moderation/src/Form/ContentModerationStateForm.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\content_moderation\Form;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\workflows\Plugin\WorkflowTypeStateFormBase;
+use Drupal\workflows\StateInterface;
+
+/**
+ * The content moderation state form.
+ *
+ * @see \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration
+ */
+class ContentModerationStateForm extends WorkflowTypeStateFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state, StateInterface $state = NULL) {
+    /** @var \Drupal\content_moderation\ContentModerationState $state */
+    $state = $form_state->get('state');
+    $is_required_state = isset($state) ? in_array($state->id(), $this->workflowType->getRequiredStates(), TRUE) : FALSE;
+
+    $form = [];
+    $form['published'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Published'),
+      '#description' => $this->t('When content reaches this state it should be published.'),
+      '#default_value' => isset($state) ? $state->isPublishedState() : FALSE,
+      '#disabled' => $is_required_state,
+    ];
+
+    $form['default_revision'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Default revision'),
+      '#description' => $this->t('When content reaches this state it should be made the default revision; this is implied for published states.'),
+      '#default_value' => isset($state) ? $state->isDefaultRevisionState() : FALSE,
+      '#disabled' => $is_required_state,
+      // @todo Add form #state to force "make default" on when "published" is
+      // on for a state.
+      // @see https://www.drupal.org/node/2645614
+    ];
+    return $form;
+  }
+
+}

web/core/modules/content_moderation/src/Form/EntityModerationForm.php

@@ -2,17 +2,20 @@
 
 namespace Drupal\content_moderation\Form;
 
+use Drupal\Component\Datetime\Time;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\RevisionLogInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\content_moderation\ModerationInformationInterface;
-use Drupal\content_moderation\StateTransitionValidation;
+use Drupal\content_moderation\StateTransitionValidationInterface;
 use Drupal\workflows\Transition;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * The EntityModerationForm provides a simple UI for changing moderation state.
+ *
+ * @internal
  */
 class EntityModerationForm extends FormBase {
 
@@ -23,10 +26,17 @@ class EntityModerationForm extends FormBase {
    */
   protected $moderationInfo;
 
+  /**
+   * The time service.
+   *
+   * @var \Drupal\Component\Datetime\Time
+   */
+  protected $time;
+
   /**
    * The moderation state transition validation service.
    *
-   * @var \Drupal\content_moderation\StateTransitionValidation
+   * @var \Drupal\content_moderation\StateTransitionValidationInterface
    */
   protected $validation;
 
@@ -35,12 +45,15 @@ class EntityModerationForm extends FormBase {
    *
    * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
    *   The moderation information service.
-   * @param \Drupal\content_moderation\StateTransitionValidation $validation
+   * @param \Drupal\content_moderation\StateTransitionValidationInterface $validation
    *   The moderation state transition validation service.
+   * @param \Drupal\Component\Datetime\Time $time
+   *   The time service.
    */
-  public function __construct(ModerationInformationInterface $moderation_info, StateTransitionValidation $validation) {
+  public function __construct(ModerationInformationInterface $moderation_info, StateTransitionValidationInterface $validation, Time $time) {
     $this->moderationInfo = $moderation_info;
     $this->validation = $validation;
+    $this->time = $time;
   }
 
   /**
@@ -49,7 +62,8 @@ class EntityModerationForm extends FormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('content_moderation.moderation_information'),
-      $container->get('content_moderation.state_transition_validation')
+      $container->get('content_moderation.state_transition_validation'),
+      $container->get('datetime.time')
     );
   }
 
@@ -71,7 +85,7 @@ class EntityModerationForm extends FormBase {
     $transitions = $this->validation->getValidTransitions($entity, $this->currentUser());
 
     // Exclude self-transitions.
-    $transitions = array_filter($transitions, function(Transition $transition) use ($current_state) {
+    $transitions = array_filter($transitions, function (Transition $transition) use ($current_state) {
       return $transition->to()->id() != $current_state;
     });
 
@@ -88,8 +102,8 @@ class EntityModerationForm extends FormBase {
     if ($current_state) {
       $form['current'] = [
         '#type' => 'item',
-        '#title' => $this->t('Status'),
-        '#markup' => $workflow->getState($current_state)->label(),
+        '#title' => $this->t('Moderation state'),
+        '#markup' => $workflow->getTypePlugin()->getState($current_state)->label(),
       ];
     }
 
@@ -98,7 +112,7 @@ class EntityModerationForm extends FormBase {
 
     $form['new_state'] = [
       '#type' => 'select',
-      '#title' => $this->t('Moderate'),
+      '#title' => $this->t('Change to'),
       '#options' => $target_states,
     ];
 
@@ -114,6 +128,7 @@ class EntityModerationForm extends FormBase {
     ];
 
     $form['#theme'] = ['entity_moderation_form'];
+    $form['#attached']['library'][] = 'content_moderation/content_moderation';
 
     return $form;
   }
@@ -122,25 +137,29 @@ class EntityModerationForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    /** @var ContentEntityInterface $entity */
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $form_state->get('entity');
+    /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
+    $storage = \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId());
+    $entity = $storage->createRevision($entity, $entity->isDefaultRevision());
 
     $new_state = $form_state->getValue('new_state');
 
     $entity->set('moderation_state', $new_state);
 
     if ($entity instanceof RevisionLogInterface) {
+      $entity->setRevisionCreationTime($this->time->getRequestTime());
       $entity->setRevisionLogMessage($form_state->getValue('revision_log'));
       $entity->setRevisionUserId($this->currentUser()->id());
     }
     $entity->save();
 
-    drupal_set_message($this->t('The moderation state has been updated.'));
+    $this->messenger()->addStatus($this->t('The moderation state has been updated.'));
 
-    $new_state = $this->moderationInfo->getWorkflowForEntity($entity)->getState($new_state);
+    $new_state = $this->moderationInfo->getWorkflowForEntity($entity)->getTypePlugin()->getState($new_state);
     // The page we're on likely won't be visible if we just set the entity to
     // the default state, as we hide that latest-revision tab if there is no
-    // forward revision. Redirect to the canonical URL instead, since that will
+    // pending revision. Redirect to the canonical URL instead, since that will
     // still exist.
     if ($new_state->isDefaultRevisionState()) {
       $form_state->setRedirectUrl($entity->toUrl('canonical'));

web/core/modules/content_moderation/src/ModeratedNodeListBuilder.php

@@ -0,0 +1,128 @@
+<?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;
+  }
+
+}

web/core/modules/content_moderation/src/ModerationInformation.php

@@ -4,15 +4,20 @@ namespace Drupal\content_moderation;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\TypedData\TranslatableInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * General service for moderation-related questions about Entity API.
  */
 class ModerationInformation implements ModerationInformationInterface {
 
+  use StringTranslationTrait;
+
   /**
    * The entity type manager.
    *
@@ -83,14 +88,15 @@ class ModerationInformation implements ModerationInformationInterface {
    */
   public function getLatestRevisionId($entity_type_id, $entity_id) {
     if ($storage = $this->entityTypeManager->getStorage($entity_type_id)) {
-      $revision_ids = $storage->getQuery()
-        ->allRevisions()
+      $result = $storage->getQuery()
+        ->latestRevision()
         ->condition($this->entityTypeManager->getDefinition($entity_type_id)->getKey('id'), $entity_id)
-        ->sort($this->entityTypeManager->getDefinition($entity_type_id)->getKey('revision'), 'DESC')
-        ->range(0, 1)
+        // No access check is performed here since this is an API function and
+        // should return the same ID regardless of the current user.
+        ->accessCheck(FALSE)
         ->execute();
-      if ($revision_ids) {
-        return array_keys($revision_ids)[0];
+      if ($result) {
+        return key($result);
       }
     }
   }
@@ -100,13 +106,27 @@ class ModerationInformation implements ModerationInformationInterface {
    */
   public function getDefaultRevisionId($entity_type_id, $entity_id) {
     if ($storage = $this->entityTypeManager->getStorage($entity_type_id)) {
-      $revision_ids = $storage->getQuery()
+      $result = $storage->getQuery()
+        ->currentRevision()
         ->condition($this->entityTypeManager->getDefinition($entity_type_id)->getKey('id'), $entity_id)
-        ->sort($this->entityTypeManager->getDefinition($entity_type_id)->getKey('revision'), 'DESC')
-        ->range(0, 1)
+        // No access check is performed here since this is an API function and
+        // should return the same ID regardless of the current user.
+        ->accessCheck(FALSE)
         ->execute();
-      if ($revision_ids) {
-        return array_keys($revision_ids)[0];
+      if ($result) {
+        return key($result);
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getAffectedRevisionTranslation(ContentEntityInterface $entity) {
+    foreach ($entity->getTranslationLanguages() as $language) {
+      $translation = $entity->getTranslation($language->getId());
+      if (!$translation->isDefaultRevision() && $translation->isRevisionTranslationAffected()) {
+        return $translation;
       }
     }
   }
@@ -121,9 +141,21 @@ class ModerationInformation implements ModerationInformationInterface {
   /**
    * {@inheritdoc}
    */
-  public function hasForwardRevision(ContentEntityInterface $entity) {
-    return $this->isModeratedEntity($entity)
-      && !($this->getLatestRevisionId($entity->getEntityTypeId(), $entity->id()) == $this->getDefaultRevisionId($entity->getEntityTypeId(), $entity->id()));
+  public function hasPendingRevision(ContentEntityInterface $entity) {
+    $result = FALSE;
+    if ($this->isModeratedEntity($entity)) {
+      /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
+      $storage = $this->entityTypeManager->getStorage($entity->getEntityTypeId());
+      $latest_revision_id = $storage->getLatestTranslationAffectedRevisionId($entity->id(), $entity->language()->getId());
+      $default_revision_id = $entity->isDefaultRevision() && !$entity->isNewRevision() && ($revision_id = $entity->getRevisionId()) ?
+        $revision_id : $this->getDefaultRevisionId($entity->getEntityTypeId(), $entity->id());
+      if ($latest_revision_id != $default_revision_id) {
+        /** @var \Drupal\Core\Entity\ContentEntityInterface $latest_revision */
+        $latest_revision = $storage->loadRevision($latest_revision_id);
+        $result = !$latest_revision->wasDefaultRevision();
+      }
+    }
+    return $result;
   }
 
   /**
@@ -134,7 +166,40 @@ class ModerationInformation implements ModerationInformationInterface {
     return $this->isLatestRevision($entity)
       && $entity->isDefaultRevision()
       && $entity->moderation_state->value
-      && $workflow->getState($entity->moderation_state->value)->isPublishedState();
+      && $workflow->getTypePlugin()->getState($entity->moderation_state->value)->isPublishedState();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isDefaultRevisionPublished(ContentEntityInterface $entity) {
+    $workflow = $this->getWorkflowForEntity($entity);
+    $default_revision = \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId())->load($entity->id());
+    // If no default revision could be loaded, the entity has not yet been
+    // saved. In this case the moderation_state of the unsaved entity can be
+    // used, since once saved it will become the default.
+    $default_revision = $default_revision  ?: $entity;
+
+    // Ensure we are checking all translations of the default revision.
+    if ($default_revision instanceof TranslatableInterface && $default_revision->isTranslatable()) {
+      // Loop through each language that has a translation.
+      foreach ($default_revision->getTranslationLanguages() as $language) {
+        // Load the translated revision.
+        $translation = $default_revision->getTranslation($language->getId());
+        // If the moderation state is empty, it was not stored yet so no point
+        // in doing further work.
+        $moderation_state = $translation->moderation_state->value;
+        if (!$moderation_state) {
+          continue;
+        }
+        // Return TRUE if a translation with a published state is found.
+        if ($workflow->getTypePlugin()->getState($moderation_state)->isPublishedState()) {
+          return TRUE;
+        }
+      }
+    }
+
+    return $workflow->getTypePlugin()->getState($default_revision->moderation_state->value)->isPublishedState();
   }
 
   /**
@@ -148,4 +213,16 @@ class ModerationInformation implements ModerationInformationInterface {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getUnsupportedFeatures(EntityTypeInterface $entity_type) {
+    $features = [];
+    // Test if entity is publishable.
+    if (!$entity_type->entityClassImplements(EntityPublishedInterface::class)) {
+      $features['publishing'] = $this->t("@entity_type_plural_label do not support publishing statuses. For example, even after transitioning from a published workflow state to an unpublished workflow state they will still be visible to site visitors.", ['@entity_type_plural_label' => $entity_type->getCollectionLabel()]);
+    }
+    return $features;
+  }
+
 }

web/core/modules/content_moderation/src/ModerationInformationInterface.php

@@ -89,6 +89,17 @@ interface ModerationInformationInterface {
    */
   public function getDefaultRevisionId($entity_type_id, $entity_id);
 
+  /**
+   * Returns the revision translation affected translation of a revision.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The content entity.
+   *
+   * @return \Drupal\Core\Entity\ContentEntityInterface
+   *   The revision translation affected translation.
+   */
+  public function getAffectedRevisionTranslation(ContentEntityInterface $entity);
+
   /**
    * Determines if an entity is a latest revision.
    *
@@ -102,15 +113,15 @@ interface ModerationInformationInterface {
   public function isLatestRevision(ContentEntityInterface $entity);
 
   /**
-   * Determines if a forward revision exists for the specified entity.
+   * Determines if a pending revision exists for the specified entity.
    *
    * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity which may or may not have a forward revision.
+   *   The entity which may or may not have a pending revision.
    *
    * @return bool
-   *   TRUE if this entity has forward revisions available, FALSE otherwise.
+   *   TRUE if this entity has pending revisions available, FALSE otherwise.
    */
-  public function hasForwardRevision(ContentEntityInterface $entity);
+  public function hasPendingRevision(ContentEntityInterface $entity);
 
   /**
    * Determines if an entity is "live".
@@ -126,6 +137,21 @@ interface ModerationInformationInterface {
    */
   public function isLiveRevision(ContentEntityInterface $entity);
 
+  /**
+   * Determines if the default revision for the given entity is published.
+   *
+   * The default revision is the same as the entity retrieved by "default" from
+   * the storage handler. If the entity is translated, check if any of the
+   * translations are published.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity being saved.
+   *
+   * @return bool
+   *   TRUE if the default revision is published. FALSE otherwise.
+   */
+  public function isDefaultRevisionPublished(ContentEntityInterface $entity);
+
   /**
    * Gets the workflow for the given content entity.
    *
@@ -137,4 +163,15 @@ interface ModerationInformationInterface {
    */
   public function getWorkflowForEntity(ContentEntityInterface $entity);
 
+  /**
+   * Gets unsupported features for a given entity type.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type to get the unsupported features for.
+   *
+   * @return array
+   *   An array of unsupported features for this entity type.
+   */
+  public function getUnsupportedFeatures(EntityTypeInterface $entity_type);
+
 }

web/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php

@@ -2,108 +2,29 @@
 
 namespace Drupal\content_moderation\ParamConverter;
 
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\ParamConverter\EntityConverter;
-use Drupal\Core\TypedData\TranslatableInterface;
-use Drupal\content_moderation\ModerationInformationInterface;
-use Symfony\Component\Routing\Route;
 
 /**
  * Defines a class for making sure the edit-route loads the current draft.
+ *
+ * @internal
+ *   This class only exists to provide backwards compatibility with the
+ *   load_pending_revision flag, the predecessor to load_latest_revision. The
+ *   core entity converter now natively loads the latest revision of an entity
+ *   when the load_latest_revision flag is present. This flag is also added
+ *   automatically to all entity forms.
  */
 class EntityRevisionConverter extends EntityConverter {
 
-  /**
-   * Moderation information service.
-   *
-   * @var \Drupal\content_moderation\ModerationInformationInterface
-   */
-  protected $moderationInformation;
-
-  /**
-   * EntityRevisionConverter constructor.
-   *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager, needed by the parent class.
-   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
-   *   The moderation info utility service.
-   *
-   * @todo: If the parent class is ever cleaned up to use EntityTypeManager
-   *   instead of Entity manager, this method will also need to be adjusted.
-   */
-  public function __construct(EntityManagerInterface $entity_manager, ModerationInformationInterface $moderation_info) {
-    parent::__construct($entity_manager);
-    $this->moderationInformation = $moderation_info;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($definition, $name, Route $route) {
-    return $this->hasForwardRevisionFlag($definition) || $this->isEditFormPage($route);
-  }
-
-  /**
-   * Determines if the route definition includes a forward-revision flag.
-   *
-   * This is a custom flag defined by the Content Moderation module to load
-   * forward revisions rather than the default revision on a given route.
-   *
-   * @param array $definition
-   *   The parameter definition provided in the route options.
-   *
-   * @return bool
-   *   TRUE if the forward revision flag is set, FALSE otherwise.
-   */
-  protected function hasForwardRevisionFlag(array $definition) {
-    return (isset($definition['load_forward_revision']) && $definition['load_forward_revision']);
-  }
-
-  /**
-   * Determines if a given route is the edit-form for an entity.
-   *
-   * @param \Symfony\Component\Routing\Route $route
-   *   The route definition.
-   *
-   * @return bool
-   *   Returns TRUE if the route is the edit form of an entity, FALSE otherwise.
-   */
-  protected function isEditFormPage(Route $route) {
-    if ($default = $route->getDefault('_entity_form')) {
-      // If no operation is provided, use 'default'.
-      $default .= '.default';
-      list($entity_type_id, $operation) = explode('.', $default);
-      if (!$this->entityManager->hasDefinition($entity_type_id)) {
-        return FALSE;
-      }
-      $entity_type = $this->entityManager->getDefinition($entity_type_id);
-      return $operation == 'edit' && $entity_type && $entity_type->isRevisionable();
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
   public function convert($value, $definition, $name, array $defaults) {
-    $entity = parent::convert($value, $definition, $name, $defaults);
-
-    if ($entity && $this->moderationInformation->isModeratedEntity($entity) && !$this->moderationInformation->isLatestRevision($entity)) {
-      $entity_type_id = $this->getEntityTypeFromDefaults($definition, $name, $defaults);
-      $latest_revision = $this->moderationInformation->getLatestRevision($entity_type_id, $value);
-
-      // If the entity type is translatable, ensure we return the proper
-      // translation object for the current context.
-      if ($latest_revision instanceof EntityInterface && $entity instanceof TranslatableInterface) {
-        $latest_revision = $this->entityManager->getTranslationFromContext($latest_revision, NULL, ['operation' => 'entity_upcast']);
-      }
-
-      if ($latest_revision instanceof EntityInterface && $latest_revision->isRevisionTranslationAffected()) {
-        $entity = $latest_revision;
-      }
+    if (!empty($definition['load_pending_revision'])) {
+      @trigger_error('The load_pending_revision flag has been deprecated. You should use load_latest_revision instead.', E_USER_DEPRECATED);
+      $definition['load_latest_revision'] = TRUE;
     }
-
-    return $entity;
+    return parent::convert($value, $definition, $name, $defaults);
   }
 
 }

web/core/modules/content_moderation/src/Permissions.php

@@ -7,6 +7,8 @@ use Drupal\workflows\Entity\Workflow;
 
 /**
  * Defines a class for dynamic permissions based on transitions.
+ *
+ * @internal
  */
 class Permissions {
 
@@ -22,11 +24,11 @@ class Permissions {
     $permissions = [];
     /** @var \Drupal\workflows\WorkflowInterface $workflow */
     foreach (Workflow::loadMultipleByType('content_moderation') as $id => $workflow) {
-      foreach ($workflow->getTransitions() as $transition) {
+      foreach ($workflow->getTypePlugin()->getTransitions() as $transition) {
         $permissions['use ' . $workflow->id() . ' transition ' . $transition->id()] = [
-          'title' => $this->t('Use %transition transition from %workflow workflow.', [
-            '%transition' => $transition->label(),
+          'title' => $this->t('%workflow workflow: Use %transition transition.', [
             '%workflow' => $workflow->label(),
+            '%transition' => $transition->label(),
           ]),
         ];
       }

web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublish.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Drupal\content_moderation\Plugin\Action;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Action\Plugin\Action\PublishAction;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\content_moderation\ModerationInformationInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Alternate action plugin that can opt-out of modifying moderated entities.
+ *
+ * @see \Drupal\Core\Action\Plugin\Action\PublishAction
+ */
+class ModerationOptOutPublish extends PublishAction implements ContainerFactoryPluginInterface {
+
+  /**
+   * Moderation information service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInfo;
+
+  /**
+   * Bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
+  /**
+   * Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
+  /**
+   * ModerationOptOutPublish constructor.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
+   *   The moderation information service.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
+   *   Bundle info service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   Messenger service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModerationInformationInterface $moderation_info, EntityTypeBundleInfoInterface $bundle_info, MessengerInterface $messenger) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager);
+    $this->moderationInfo = $moderation_info;
+    $this->bundleInfo = $bundle_info;
+    $this->messenger = $messenger;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration, $plugin_id, $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('content_moderation.moderation_information'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('messenger')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    if ($entity && $this->moderationInfo->isModeratedEntity($entity)) {
+      $bundle_info = $this->bundleInfo->getBundleInfo($entity->getEntityTypeId());
+      $bundle_label = $bundle_info[$entity->bundle()]['label'];
+      $this->messenger->addWarning($this->t("@bundle @label were skipped as they are under moderation and may not be directly published.", [
+        '@bundle' => $bundle_label,
+        '@label' => $entity->getEntityType()->getPluralLabel(),
+      ]));
+      $result = AccessResult::forbidden('Cannot directly publish moderated entities.');
+      return $return_as_object ? $result : $result->isAllowed();
+    }
+    return parent::access($entity, $account, $return_as_object);
+  }
+
+}

web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php

@@ -2,65 +2,28 @@
 
 namespace Drupal\content_moderation\Plugin\Action;
 
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\node\Plugin\Action\PublishNode;
 use Drupal\content_moderation\ModerationInformationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
  * Alternate action plugin that can opt-out of modifying moderated entities.
  *
- * @see \Drupal\node\Plugin\Action\PublishNode
+ * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ *   Use \Drupal\content_moderation\Plugin\Action\ModerationOptOutPublish
+ *   instead.
+ *
+ * @see \Drupal\content_moderation\Plugin\Action\ModerationOptOutPublish
+ * @see https://www.drupal.org/node/2919303
  */
-class ModerationOptOutPublishNode extends PublishNode implements ContainerFactoryPluginInterface {
-
-  /**
-   * Moderation information service.
-   *
-   * @var \Drupal\content_moderation\ModerationInformationInterface
-   */
-  protected $moderationInfo;
-
-  /**
-   * ModerationOptOutPublishNode constructor.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
-   *   The moderation information service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModerationInformationInterface $moderation_info) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->moderationInfo = $moderation_info;
-  }
+class ModerationOptOutPublishNode extends ModerationOptOutPublish {
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $container->get('content_moderation.moderation_information')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    /** @var \Drupal\node\NodeInterface $entity */
-    if ($entity && $this->moderationInfo->isModeratedEntity($entity)) {
-      drupal_set_message($this->t("@bundle @label were skipped as they are under moderation and may not be directly published.", ['@bundle' => node_get_type_label($entity), '@label' => $entity->getEntityType()->getPluralLabel()]), 'warning');
-      $result = AccessResult::forbidden();
-      return $return_as_object ? $result : $result->isAllowed();
-    }
-    return parent::access($entity, $account, $return_as_object);
+  public function __construct($configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModerationInformationInterface $moderation_info, EntityTypeBundleInfoInterface $bundle_info) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $moderation_info, $bundle_info);
+    @trigger_error(__NAMESPACE__ . '\ModerationOptOutPublishNode is deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Use \Drupal\content_moderation\Plugin\Action\ModerationOptOutPublish instead. See https://www.drupal.org/node/2919303.', E_USER_DEPRECATED);
   }
 
 }

web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublish.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Drupal\content_moderation\Plugin\Action;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Action\Plugin\Action\UnpublishAction;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\content_moderation\ModerationInformationInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Alternate action plugin that can opt-out of modifying moderated entities.
+ *
+ * @see \Drupal\Core\Action\Plugin\Action\UnpublishAction
+ */
+class ModerationOptOutUnpublish extends UnpublishAction implements ContainerFactoryPluginInterface {
+
+  /**
+   * Moderation information service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInfo;
+
+  /**
+   * Bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
+  /**
+   * Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
+  /**
+   * ModerationOptOutUnpublish constructor.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
+   *   The moderation information service.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
+   *   Bundle info service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   Messenger service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModerationInformationInterface $moderation_info, EntityTypeBundleInfoInterface $bundle_info, MessengerInterface $messenger) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager);
+    $this->moderationInfo = $moderation_info;
+    $this->bundleInfo = $bundle_info;
+    $this->messenger = $messenger;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration, $plugin_id, $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('content_moderation.moderation_information'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('messenger')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    if ($entity && $this->moderationInfo->isModeratedEntity($entity)) {
+      $bundle_info = $this->bundleInfo->getBundleInfo($entity->getEntityTypeId());
+      $bundle_label = $bundle_info[$entity->bundle()]['label'];
+      $this->messenger->addWarning($this->t("@bundle @label were skipped as they are under moderation and may not be directly unpublished.", [
+        '@bundle' => $bundle_label,
+        '@label' => $entity->getEntityType()->getPluralLabel(),
+      ]));
+      $result = AccessResult::forbidden('Cannot directly unpublish moderated entities.');
+      return $return_as_object ? $result : $result->isAllowed();
+    }
+    return parent::access($entity, $account, $return_as_object);
+  }
+
+}

web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php

@@ -2,65 +2,28 @@
 
 namespace Drupal\content_moderation\Plugin\Action;
 
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\node\Plugin\Action\UnpublishNode;
 use Drupal\content_moderation\ModerationInformationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
  * Alternate action plugin that can opt-out of modifying moderated entities.
  *
- * @see \Drupal\node\Plugin\Action\UnpublishNode
+ * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
+ *   Use \Drupal\content_moderation\Plugin\Action\ModerationOptOutUnpublish
+ *   instead.
+ *
+ * @see \Drupal\content_moderation\Plugin\Action\ModerationOptOutPublish
+ * @see https://www.drupal.org/node/2919303
  */
-class ModerationOptOutUnpublishNode extends UnpublishNode implements ContainerFactoryPluginInterface {
-
-  /**
-   * Moderation information service.
-   *
-   * @var \Drupal\content_moderation\ModerationInformationInterface
-   */
-  protected $moderationInfo;
-
-  /**
-   * ModerationOptOutUnpublishNode constructor.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
-   *   The moderation information service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModerationInformationInterface $moderation_info) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->moderationInfo = $moderation_info;
-  }
+class ModerationOptOutUnpublishNode extends ModerationOptOutUnpublish {
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $container->get('content_moderation.moderation_information')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    /** @var \Drupal\node\NodeInterface $entity */
-    if ($entity && $this->moderationInfo->isModeratedEntity($entity)) {
-      drupal_set_message($this->t("@bundle @label were skipped as they are under moderation and may not be directly unpublished.", ['@bundle' => node_get_type_label($entity), '@label' => $entity->getEntityType()->getPluralLabel()]), 'warning');
-      $result = AccessResult::forbidden();
-      return $return_as_object ? $result : $result->isAllowed();
-    }
-    return parent::access($entity, $account, $return_as_object);
+  public function __construct($configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModerationInformationInterface $moderation_info, EntityTypeBundleInfoInterface $bundle_info) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $moderation_info, $bundle_info);
+    @trigger_error(__NAMESPACE__ . '\ModerationOptOutUnpublishNode is deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Use \Drupal\content_moderation\Plugin\Action\ModerationOptOutUnpublish instead. See https://www.drupal.org/node/2919303.', E_USER_DEPRECATED);
   }
 
 }

web/core/modules/content_moderation/src/Plugin/Derivative/DynamicLocalTasks.php

@@ -76,19 +76,6 @@ class DynamicLocalTasks extends DeriverBase implements ContainerDeriverInterface
   public function getDerivativeDefinitions($base_plugin_definition) {
     $this->derivatives = [];
 
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      if ($this->moderationInfo->canModerateEntitiesOfEntityType($entity_type)) {
-        $bundle_id = $entity_type->getBundleEntityType();
-        $this->derivatives["$bundle_id.moderation_tab"] = [
-          'route_name' => "entity.$bundle_id.moderation",
-          'title' => $this->t('Manage moderation'),
-          // @todo - are we sure they all have an edit_form?
-          'base_route' => "entity.$bundle_id.edit_form",
-          'weight' => 30,
-        ] + $base_plugin_definition;
-      }
-    }
-
     $latest_version_entities = array_filter($this->entityTypeManager->getDefinitions(), function (EntityTypeInterface $type) {
       return $this->moderationInfo->canModerateEntitiesOfEntityType($type) && $type->hasLinkTemplate('latest-version');
     });

web/core/modules/content_moderation/src/Plugin/Field/FieldFormatter/ContentModerationStateFormatter.php

@@ -61,7 +61,7 @@ class ContentModerationStateFormatter extends FormatterBase implements Container
     $workflow = $this->moderationInformation->getWorkflowForEntity($items->getEntity());
     foreach ($items as $delta => $item) {
       $elements[$delta] = [
-        '#markup' => $workflow->getState($item->value)->label(),
+        '#markup' => $workflow->getTypePlugin()->getState($item->value)->label(),
       ];
     }
     return $elements;

web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\content_moderation\Plugin\Field\FieldWidget;
 
-use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\content_moderation\Plugin\Field\ModerationStateFieldItemList;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
@@ -11,7 +11,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\content_moderation\ModerationInformation;
-use Drupal\content_moderation\StateTransitionValidation;
+use Drupal\content_moderation\StateTransitionValidationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -51,7 +51,7 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
   /**
    * Moderation state transition validation service.
    *
-   * @var \Drupal\content_moderation\StateTransitionValidation
+   * @var \Drupal\content_moderation\StateTransitionValidationInterface
    */
   protected $validator;
 
@@ -74,10 +74,10 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
    *   Entity type manager.
    * @param \Drupal\content_moderation\ModerationInformation $moderation_information
    *   Moderation information service.
-   * @param \Drupal\content_moderation\StateTransitionValidation $validator
-   *   Moderation state transition validation service
+   * @param \Drupal\content_moderation\StateTransitionValidationInterface $validator
+   *   Moderation state transition validation service.
    */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, ModerationInformation $moderation_information, StateTransitionValidation $validator) {
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, ModerationInformation $moderation_information, StateTransitionValidationInterface $validator) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $third_party_settings);
     $this->entityTypeManager = $entity_type_manager;
     $this->currentUser = $current_user;
@@ -102,113 +102,80 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function form(FieldItemListInterface $items, array &$form, FormStateInterface $form_state, $get_delta = NULL) {
+    $entity = $items->getEntity();
+    if (!$this->moderationInformation->isModeratedEntity($entity)) {
+      return [];
+    }
+    return parent::form($items, $form, $form_state, $get_delta);
+  }
+
   /**
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    /** @var ContentEntityInterface $entity */
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $items->getEntity();
 
-    if (!$this->moderationInformation->isModeratedEntity($entity)) {
-      // @todo https://www.drupal.org/node/2779933 write a test for this.
-      return $element + ['#access' => FALSE];
-    }
-
     $workflow = $this->moderationInformation->getWorkflowForEntity($entity);
-    $default = $items->get($delta)->value ? $workflow->getState($items->get($delta)->value) : $workflow->getTypePlugin()->getInitialState($workflow, $entity);
+    $default = $items->get($delta)->value ? $workflow->getTypePlugin()->getState($items->get($delta)->value) : $workflow->getTypePlugin()->getInitialState($entity);
 
     /** @var \Drupal\workflows\Transition[] $transitions */
     $transitions = $this->validator->getValidTransitions($entity, $this->currentUser);
 
-    $target_states = [];
+    $transition_labels = [];
+    $default_value = $items->value;
     foreach ($transitions as $transition) {
-      $target_states[$transition->to()->id()] = $transition->label();
+      $transition_to_state = $transition->to();
+      $transition_labels[$transition_to_state->id()] = $transition_to_state->label();
+      if ($default->id() === $transition_to_state->id()) {
+        $default_value = $default->id();
+      }
     }
 
-    // @todo https://www.drupal.org/node/2779933 write a test for this.
     $element += [
-      '#access' => FALSE,
-      '#type' => 'select',
-      '#options' => $target_states,
-      '#default_value' => $default->id(),
-      '#published' => $default->isPublishedState(),
-      '#key_column' => $this->column,
+      '#type' => 'container',
+      'current' => [
+        '#type' => 'item',
+        '#title' => $this->t('Current state'),
+        '#markup' => $default->label(),
+        '#access' => !$entity->isNew(),
+        '#wrapper_attributes' => [
+          'class' => ['container-inline'],
+        ],
+      ],
+      'state' => [
+        '#type' => 'select',
+        '#title' => $entity->isNew() ? $this->t('Save as') : $this->t('Change to'),
+        '#key_column' => $this->column,
+        '#options' => $transition_labels,
+        '#default_value' => $default_value,
+        '#access' => !empty($transition_labels),
+        '#wrapper_attributes' => [
+          'class' => ['container-inline'],
+        ],
+      ],
     ];
     $element['#element_validate'][] = [get_class($this), 'validateElement'];
 
-    // Use the dropbutton.
-    $element['#process'][] = [get_called_class(), 'processActions'];
-    return $element;
-  }
-
-  /**
-   * Entity builder updating the node moderation state with the submitted value.
-   *
-   * @param string $entity_type_id
-   *   The entity type identifier.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity updated with the submitted values.
-   * @param array $form
-   *   The complete form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function updateStatus($entity_type_id, ContentEntityInterface $entity, array $form, FormStateInterface $form_state) {
-    $element = $form_state->getTriggeringElement();
-    if (isset($element['#moderation_state'])) {
-      $entity->moderation_state->value = $element['#moderation_state'];
-    }
-  }
-
-  /**
-   * Process callback to alter action buttons.
-   */
-  public static function processActions($element, FormStateInterface $form_state, array &$form) {
-
-    // We'll steal most of the button configuration from the default submit
-    // button. However, NodeForm also hides that button for admins (as it adds
-    // its own, too), so we have to restore it.
-    $default_button = $form['actions']['submit'];
-    $default_button['#access'] = TRUE;
-
-    // Add a custom button for each transition we're allowing. The #dropbutton
-    // property tells FAPI to cluster them all together into a single widget.
-    $options = $element['#options'];
-
-    $entity = $form_state->getFormObject()->getEntity();
-    $translatable = !$entity->isNew() && $entity->isTranslatable();
-    foreach ($options as $id => $label) {
-      $button = [
-        '#dropbutton' => 'save',
-        '#moderation_state' => $id,
-        '#weight' => -10,
-      ];
-
-      $button['#value'] = $translatable
-        ? t('Save and @transition (this translation)', ['@transition' => $label])
-        : t('Save and @transition', ['@transition' => $label]);
-
-      $form['actions']['moderation_state_' . $id] = $button + $default_button;
-    }
-
-    // Hide the default buttons, including the specialty ones added by
-    // NodeForm.
-    foreach (['publish', 'unpublish', 'submit'] as $key) {
-      $form['actions'][$key]['#access'] = FALSE;
-      unset($form['actions'][$key]['#dropbutton']);
-    }
-
-    // Setup a callback to translate the button selection back into field
-    // widget, so that it will get saved properly.
-    $form['#entity_builders']['update_moderation_state'] = [get_called_class(), 'updateStatus'];
     return $element;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function validateElement(array $element, FormStateInterface $form_state) {
+    $form_state->setValueForElement($element, [$element['state']['#key_column'] => $element['state']['#value']]);
+  }
+
   /**
    * {@inheritdoc}
    */
   public static function isApplicable(FieldDefinitionInterface $field_definition) {
-    return $field_definition->getName() === 'moderation_state';
+    return is_a($field_definition->getClass(), ModerationStateFieldItemList::class, TRUE);
   }
 
 }

web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php

@@ -3,7 +3,9 @@
 namespace Drupal\content_moderation\Plugin\Field;
 
 use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Field\FieldItemList;
+use Drupal\Core\TypedData\ComputedItemListTrait;
 
 /**
  * A computed field that provides a content entity's moderation state.
@@ -13,6 +15,24 @@ use Drupal\Core\Field\FieldItemList;
  */
 class ModerationStateFieldItemList extends FieldItemList {
 
+  use ComputedItemListTrait {
+    get as traitGet;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function computeValue() {
+    $moderation_state = $this->getModerationStateId();
+    // Do not store NULL values, in the case where an entity does not have a
+    // moderation workflow associated with it, we do not create list items for
+    // the computed field.
+    if ($moderation_state) {
+      // An entity can only have a single moderation state.
+      $this->list[0] = $this->createItem(0, $moderation_state);
+    }
+  }
+
   /**
    * Gets the moderation state ID linked to a content entity revision.
    *
@@ -38,7 +58,7 @@ class ModerationStateFieldItemList extends FieldItemList {
     // the node type form creates a fake Node entity to get default values.
     // @see \Drupal\node\NodeTypeForm::form()
     $workflow = $moderation_info->getWorkFlowForEntity($entity);
-    return $workflow ? $workflow->getTypePlugin()->getInitialState($workflow, $entity)->id() : NULL;
+    return $workflow ? $workflow->getTypePlugin()->getInitialState($entity)->id() : NULL;
   }
 
   /**
@@ -47,14 +67,14 @@ class ModerationStateFieldItemList extends FieldItemList {
    * @param \Drupal\Core\Entity\ContentEntityInterface $entity
    *   The entity the content moderation state entity will be loaded from.
    *
-   * @return \Drupal\content_moderation\ContentModerationStateInterface|null
+   * @return \Drupal\content_moderation\Entity\ContentModerationStateInterface|null
    *   The content_moderation_state revision or FALSE if none exists.
    */
   protected function loadContentModerationStateRevision(ContentEntityInterface $entity) {
     $moderation_info = \Drupal::service('content_moderation.moderation_information');
     $content_moderation_storage = \Drupal::entityTypeManager()->getStorage('content_moderation_state');
 
-    $revisions = \Drupal::service('entity.query')->get('content_moderation_state')
+    $revisions = $content_moderation_storage->getQuery()
       ->condition('content_entity_type_id', $entity->getEntityTypeId())
       ->condition('content_entity_id', $entity->id())
       // Ensure the correct revision is loaded in scenarios where a revision is
@@ -68,7 +88,7 @@ class ModerationStateFieldItemList extends FieldItemList {
       return NULL;
     }
 
-    /** @var \Drupal\content_moderation\ContentModerationStateInterface $content_moderation_state */
+    /** @var \Drupal\content_moderation\Entity\ContentModerationStateInterface $content_moderation_state */
     $content_moderation_state = $content_moderation_storage->loadRevision(key($revisions));
     if ($entity->getEntityType()->hasKey('langcode')) {
       $langcode = $entity->language()->getId();
@@ -89,30 +109,64 @@ class ModerationStateFieldItemList extends FieldItemList {
     if ($index !== 0) {
       throw new \InvalidArgumentException('An entity can not have multiple moderation states at the same time.');
     }
-    $this->computeModerationFieldItemList();
-    return isset($this->list[$index]) ? $this->list[$index] : NULL;
+    return $this->traitGet($index);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getIterator() {
-    $this->computeModerationFieldItemList();
-    return parent::getIterator();
+  public function onChange($delta) {
+    $this->updateModeratedEntity($this->list[$delta]->value);
+
+    parent::onChange($delta);
   }
 
   /**
-   * Recalculate the moderation field item list.
+   * {@inheritdoc}
    */
-  protected function computeModerationFieldItemList() {
-    // Compute the value of the moderation state.
-    $index = 0;
-    if (!isset($this->list[$index]) || $this->list[$index]->isEmpty()) {
+  public function setValue($values, $notify = TRUE) {
+    parent::setValue($values, $notify);
+    $this->valueComputed = TRUE;
 
-      $moderation_state = $this->getModerationStateId();
-      // Do not store NULL values in the static cache.
-      if ($moderation_state) {
-        $this->list[$index] = $this->createItem($index, $moderation_state);
+    // If the parent created a field item and if the parent should be notified
+    // about the change (e.g. this is not initialized with the current value),
+    // update the moderated entity.
+    if (isset($this->list[0]) && $notify) {
+      $this->updateModeratedEntity($this->list[0]->value);
+    }
+  }
+
+  /**
+   * Updates the default revision flag and the publishing status of the entity.
+   *
+   * @param string $moderation_state_id
+   *   The ID of the new moderation state.
+   */
+  protected function updateModeratedEntity($moderation_state_id) {
+    $entity = $this->getEntity();
+
+    /** @var \Drupal\content_moderation\ModerationInformationInterface $content_moderation_info */
+    $content_moderation_info = \Drupal::service('content_moderation.moderation_information');
+    $workflow = $content_moderation_info->getWorkflowForEntity($entity);
+
+    // Change the entity's default revision flag and the publishing status only
+    // if the new workflow state is a valid one.
+    if ($workflow && $workflow->getTypePlugin()->hasState($moderation_state_id)) {
+      /** @var \Drupal\content_moderation\ContentModerationState $current_state */
+      $current_state = $workflow->getTypePlugin()->getState($moderation_state_id);
+
+      // This entity is default if it is new, the default revision state, or the
+      // default revision is not published.
+      $update_default_revision = $entity->isNew()
+        || $current_state->isDefaultRevisionState()
+        || !$content_moderation_info->isDefaultRevisionPublished($entity);
+
+      $entity->isDefaultRevision($update_default_revision);
+
+      // Update publishing status if it can be updated and if it needs updating.
+      $published_state = $current_state->isPublishedState();
+      if (($entity instanceof EntityPublishedInterface) && $entity->isPublished() !== $published_state) {
+        $published_state ? $entity->setPublished() : $entity->setUnpublished();
       }
     }
   }

web/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php

@@ -15,5 +15,7 @@ use Symfony\Component\Validator\Constraint;
 class ModerationStateConstraint extends Constraint {
 
   public $message = 'Invalid state transition from %from to %to';
+  public $invalidStateMessage = 'State %state does not exist on %workflow workflow';
+  public $invalidTransitionAccess = 'You do not have access to transition from %original_state to %new_state';
 
 }

web/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php

@@ -2,11 +2,14 @@
 
 namespace Drupal\content_moderation\Plugin\Validation\Constraint;
 
+use Drupal\content_moderation\StateTransitionValidationInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\content_moderation\ModerationInformationInterface;
-use Drupal\content_moderation\StateTransitionValidation;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Validation\Plugin\Validation\Constraint\NotNullConstraint;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -16,13 +19,6 @@ use Symfony\Component\Validator\ConstraintValidator;
  */
 class ModerationStateConstraintValidator extends ConstraintValidator implements ContainerInjectionInterface {
 
-  /**
-   * The state transition validation.
-   *
-   * @var \Drupal\content_moderation\StateTransitionValidation
-   */
-  protected $validation;
-
   /**
    * The entity type manager.
    *
@@ -37,20 +33,37 @@ class ModerationStateConstraintValidator extends ConstraintValidator implements
    */
   protected $moderationInformation;
 
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $currentUser;
+
+  /**
+   * The state transition validation service.
+   *
+   * @var \Drupal\content_moderation\StateTransitionValidationInterface
+   */
+  protected $stateTransitionValidation;
+
   /**
    * Creates a new ModerationStateConstraintValidator instance.
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
-   * @param \Drupal\content_moderation\StateTransitionValidation $validation
-   *   The state transition validation.
    * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_information
    *   The moderation information.
+   * @param \Drupal\Core\Session\AccountInterface $current_user
+   *   The current user.
+   * @param \Drupal\content_moderation\StateTransitionValidationInterface $state_transition_validation
+   *   The state transition validation service.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, StateTransitionValidation $validation, ModerationInformationInterface $moderation_information) {
-    $this->validation = $validation;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, ModerationInformationInterface $moderation_information, AccountInterface $current_user, StateTransitionValidationInterface $state_transition_validation) {
     $this->entityTypeManager = $entity_type_manager;
     $this->moderationInformation = $moderation_information;
+    $this->currentUser = $current_user;
+    $this->stateTransitionValidation = $state_transition_validation;
   }
 
   /**
@@ -59,8 +72,9 @@ class ModerationStateConstraintValidator extends ConstraintValidator implements
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity_type.manager'),
-      $container->get('content_moderation.state_transition_validation'),
-      $container->get('content_moderation.moderation_information')
+      $container->get('content_moderation.moderation_information'),
+      $container->get('current_user'),
+      $container->get('content_moderation.state_transition_validation')
     );
   }
 
@@ -68,7 +82,7 @@ class ModerationStateConstraintValidator extends ConstraintValidator implements
    * {@inheritdoc}
    */
   public function validate($value, Constraint $constraint) {
-    /** @var \Drupal\Core\Entity\EntityInterface $entity */
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $value->getEntity();
 
     // Ignore entities that are not subject to moderation anyway.
@@ -76,30 +90,78 @@ class ModerationStateConstraintValidator extends ConstraintValidator implements
       return;
     }
 
-    // Ignore entities that are being created for the first time.
-    if ($entity->isNew()) {
+    // If the entity is moderated and the item list is empty, ensure users see
+    // the same required message as typical NotNull constraints.
+    if ($value->isEmpty()) {
+      $this->context->addViolation((new NotNullConstraint())->message);
       return;
     }
 
-    // Ignore entities that are being moderated for the first time, such as
-    // when they existed before moderation was enabled for this entity type.
-    if ($this->isFirstTimeModeration($entity)) {
-      return;
-    }
-
-    $original_entity = $this->moderationInformation->getLatestRevision($entity->getEntityTypeId(), $entity->id());
-    if (!$entity->isDefaultTranslation() && $original_entity->hasTranslation($entity->language()->getId())) {
-      $original_entity = $original_entity->getTranslation($entity->language()->getId());
-    }
-
     $workflow = $this->moderationInformation->getWorkflowForEntity($entity);
-    $new_state = $workflow->getState($entity->moderation_state->value) ?: $workflow->getInitialState();
-    $original_state = $workflow->getState($original_entity->moderation_state->value);
-    // @todo - what if $new_state references something that does not exist or
-    //   is null.
-    if (!$original_state->canTransitionTo($new_state->id())) {
-      $this->context->addViolation($constraint->message, ['%from' => $original_state->label(), '%to' => $new_state->label()]);
+
+    if (!$workflow->getTypePlugin()->hasState($entity->moderation_state->value)) {
+      // If the state we are transitioning to doesn't exist, we can't validate
+      // the transitions for this entity further.
+      $this->context->addViolation($constraint->invalidStateMessage, [
+        '%state' => $entity->moderation_state->value,
+        '%workflow' => $workflow->label(),
+      ]);
+      return;
     }
+
+    $new_state = $workflow->getTypePlugin()->getState($entity->moderation_state->value);
+    $original_state = $this->getOriginalOrInitialState($entity);
+
+    // If a new state is being set and there is an existing state, validate
+    // there is a valid transition between them.
+    if (!$original_state->canTransitionTo($new_state->id())) {
+      $this->context->addViolation($constraint->message, [
+        '%from' => $original_state->label(),
+        '%to' => $new_state->label(),
+      ]);
+    }
+    else {
+      // If we're sure the transition exists, make sure the user has permission
+      // to use it.
+      if (!$this->stateTransitionValidation->isTransitionValid($workflow, $original_state, $new_state, $this->currentUser)) {
+        $this->context->addViolation($constraint->invalidTransitionAccess, [
+          '%original_state' => $original_state->label(),
+          '%new_state' => $new_state->label(),
+        ]);
+      }
+    }
+  }
+
+  /**
+   * Gets the original or initial state of the given entity.
+   *
+   * When a state is being validated, the original state is used to validate
+   * that a valid transition exists for target state and the user has access
+   * to the transition between those two states. If the entity has been
+   * moderated before, we can load the original unmodified revision and
+   * translation for this state.
+   *
+   * If the entity is new we need to load the initial state from the workflow.
+   * Even if a value was assigned to the moderation_state field, the initial
+   * state is used to compute an appropriate transition for the purposes of
+   * validation.
+   *
+   * @return \Drupal\workflows\StateInterface
+   *   The original or default moderation state.
+   */
+  protected function getOriginalOrInitialState(ContentEntityInterface $entity) {
+    $state = NULL;
+    $workflow_type = $this->moderationInformation->getWorkflowForEntity($entity)->getTypePlugin();
+    if (!$entity->isNew() && !$this->isFirstTimeModeration($entity)) {
+      $original_entity = $this->entityTypeManager->getStorage($entity->getEntityTypeId())->loadRevision($entity->getLoadedRevisionId());
+      if (!$entity->isDefaultTranslation() && $original_entity->hasTranslation($entity->language()->getId())) {
+        $original_entity = $original_entity->getTranslation($entity->language()->getId());
+      }
+      if ($workflow_type->hasState($original_entity->moderation_state->value)) {
+        $state = $workflow_type->getState($original_entity->moderation_state->value);
+      }
+    }
+    return $state ?: $workflow_type->getInitialState($entity);
   }
 
   /**

web/core/modules/content_moderation/src/Plugin/WorkflowType/ContentModeration.php

@@ -2,12 +2,12 @@
 
 namespace Drupal\content_moderation\Plugin\WorkflowType;
 
-use Drupal\Core\Access\AccessResult;
+use Drupal\content_moderation\ModerationInformationInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\EntityPublishedInterface;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\content_moderation\ContentModerationState;
 use Drupal\workflows\Plugin\WorkflowTypeBase;
@@ -25,9 +25,13 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  *     "draft",
  *     "published",
  *   },
+ *   forms = {
+ *     "configure" = "\Drupal\content_moderation\Form\ContentModerationConfigureForm",
+ *     "state" = "\Drupal\content_moderation\Form\ContentModerationStateForm"
+ *   },
  * )
  */
-class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPluginInterface {
+class ContentModeration extends WorkflowTypeBase implements ContentModerationInterface, ContainerFactoryPluginInterface {
 
   use StringTranslationTrait;
 
@@ -39,11 +43,38 @@ class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPlug
   protected $entityTypeManager;
 
   /**
-   * Creates an instance of the ContentModeration WorkflowType plugin.
+   * The entity type bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
+  protected $entityTypeBundleInfo;
+
+  /**
+   * The moderation information service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInfo;
+
+  /**
+   * Constructs a ContentModeration object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
+   *   Moderation information service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, ModerationInformationInterface $moderation_info) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityTypeManager = $entity_type_manager;
+    $this->entityTypeBundleInfo = $entity_type_bundle_info;
+    $this->moderationInfo = $moderation_info;
   }
 
   /**
@@ -54,39 +85,18 @@ class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPlug
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity_type.manager')
+      $container->get('entity_type.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('content_moderation.moderation_information')
     );
   }
 
   /**
    * {@inheritdoc}
    */
-  public function initializeWorkflow(WorkflowInterface $workflow) {
-    $workflow
-      ->addState('draft', $this->t('Draft'))
-      ->setStateWeight('draft', -5)
-      ->addState('published', $this->t('Published'))
-      ->setStateWeight('published', 0)
-      ->addTransition('create_new_draft', $this->t('Create New Draft'), ['draft', 'published'], 'draft')
-      ->addTransition('publish', $this->t('Publish'), ['draft', 'published'], 'published');
-    return $workflow;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkWorkflowAccess(WorkflowInterface $entity, $operation, AccountInterface $account) {
-    if ($operation === 'view') {
-      return AccessResult::allowedIfHasPermission($account, 'view content moderation');
-    }
-    return parent::checkWorkflowAccess($entity, $operation, $account);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function decorateState(StateInterface $state) {
-    if (isset($this->configuration['states'][$state->id()])) {
+  public function getState($state_id) {
+    $state = parent::getState($state_id);
+    if (isset($this->configuration['states'][$state->id()]['published']) && isset($this->configuration['states'][$state->id()]['default_revision'])) {
       $state = new ContentModerationState($state, $this->configuration['states'][$state->id()]['published'], $this->configuration['states'][$state->id()]['default_revision']);
     }
     else {
@@ -98,81 +108,60 @@ class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPlug
   /**
    * {@inheritdoc}
    */
-  public function buildStateConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, StateInterface $state = NULL) {
-    /** @var \Drupal\content_moderation\ContentModerationState $state */
-    $is_required_state = isset($state) ? in_array($state->id(), $this->getRequiredStates(), TRUE) : FALSE;
-
-    $form = [];
-    $form['published'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Published'),
-      '#description' => $this->t('When content reaches this state it should be published.'),
-      '#default_value' => isset($state) ? $state->isPublishedState() : FALSE,
-      '#disabled' => $is_required_state,
-    ];
-
-    $form['default_revision'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Default revision'),
-      '#description' => $this->t('When content reaches this state it should be made the default revision; this is implied for published states.'),
-      '#default_value' => isset($state) ? $state->isDefaultRevisionState() : FALSE,
-      '#disabled' => $is_required_state,
-      // @todo Add form #state to force "make default" on when "published" is
-      // on for a state.
-      // @see https://www.drupal.org/node/2645614
-    ];
-    return $form;
+  public function workflowHasData(WorkflowInterface $workflow) {
+    return (bool) $this->entityTypeManager
+      ->getStorage('content_moderation_state')
+      ->getQuery()
+      ->condition('workflow', $workflow->id())
+      ->count()
+      ->accessCheck(FALSE)
+      ->range(0, 1)
+      ->execute();
   }
 
   /**
-   * Gets the entity types the workflow is applied to.
-   *
-   * @return string[]
-   *   The entity types the workflow is applied to.
+   * {@inheritdoc}
+   */
+  public function workflowStateHasData(WorkflowInterface $workflow, StateInterface $state) {
+    return (bool) $this->entityTypeManager
+      ->getStorage('content_moderation_state')
+      ->getQuery()
+      ->condition('workflow', $workflow->id())
+      ->condition('moderation_state', $state->id())
+      ->count()
+      ->accessCheck(FALSE)
+      ->range(0, 1)
+      ->execute();
+  }
+
+  /**
+   * {@inheritdoc}
    */
   public function getEntityTypes() {
     return array_keys($this->configuration['entity_types']);
   }
 
   /**
-   * Gets any bundles the workflow is applied to for the given entity type.
-   *
-   * @param string $entity_type_id
-   *   The entity type ID to get the bundles for.
-   *
-   * @return string[]
-   *   The bundles of the entity type the workflow is applied to or an empty
-   *   array if the entity type is not applied to the workflow.
+   * {@inheritdoc}
    */
   public function getBundlesForEntityType($entity_type_id) {
     return isset($this->configuration['entity_types'][$entity_type_id]) ? $this->configuration['entity_types'][$entity_type_id] : [];
   }
 
   /**
-   * Checks if the workflow applies to the supplied entity type and bundle.
-   *
-   * @param string $entity_type_id
-   *   The entity type ID to check.
-   * @param string $bundle_id
-   *   The bundle ID to check.
-   *
-   * @return bool
-   *   TRUE if the workflow applies to the supplied entity type ID and bundle
-   *   ID. FALSE if not.
+   * {@inheritdoc}
    */
   public function appliesToEntityTypeAndBundle($entity_type_id, $bundle_id) {
     return in_array($bundle_id, $this->getBundlesForEntityType($entity_type_id), TRUE);
   }
 
   /**
-   * Removes an entity type ID / bundle ID from the workflow.
-   *
-   * @param string $entity_type_id
-   *   The entity type ID to remove.
-   * @param string $bundle_id
-   *   The bundle ID to remove.
+   * {@inheritdoc}
    */
   public function removeEntityTypeAndBundle($entity_type_id, $bundle_id) {
+    if (!isset($this->configuration['entity_types'][$entity_type_id])) {
+      return;
+    }
     $key = array_search($bundle_id, $this->configuration['entity_types'][$entity_type_id], TRUE);
     if ($key !== FALSE) {
       unset($this->configuration['entity_types'][$entity_type_id][$key]);
@@ -186,14 +175,7 @@ class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPlug
   }
 
   /**
-   * Add an entity type ID / bundle ID to the workflow.
-   *
-   * @param string $entity_type_id
-   *   The entity type ID to add. It is responsibility of the caller to provide
-   *   a valid entity type ID.
-   * @param string $bundle_id
-   *   The bundle ID to add. It is responsibility of the caller to provide a
-   *   valid bundle ID.
+   * {@inheritdoc}
    */
   public function addEntityTypeAndBundle($entity_type_id, $bundle_id) {
     if (!$this->appliesToEntityTypeAndBundle($entity_type_id, $bundle_id)) {
@@ -204,19 +186,42 @@ class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPlug
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    // This plugin does not store anything per transition.
     return [
       'states' => [
         'draft' => [
+          'label' => 'Draft',
           'published' => FALSE,
           'default_revision' => FALSE,
+          'weight' => 0,
         ],
         'published' => [
+          'label' => 'Published',
           'published' => TRUE,
           'default_revision' => TRUE,
+          'weight' => 1,
+        ],
+      ],
+      'transitions' => [
+        'create_new_draft' => [
+          'label' => 'Create New Draft',
+          'to' => 'draft',
+          'weight' => 0,
+          'from' => [
+            'draft',
+            'published',
+          ],
+        ],
+        'publish' => [
+          'label' => 'Publish',
+          'to' => 'published',
+          'weight' => 1,
+          'from' => [
+            'draft',
+            'published',
+          ],
         ],
       ],
       'entity_types' => [],
@@ -293,11 +298,19 @@ class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPlug
   /**
    * {@inheritdoc}
    */
-  public function getInitialState(WorkflowInterface $workflow, $entity = NULL) {
-    if ($entity instanceof EntityPublishedInterface) {
-      return $workflow->getState($entity->isPublished() ? 'published' : 'draft');
+  public function getInitialState($entity = NULL) {
+    // Workflows are not tied to entities, but Content Moderation adds the
+    // relationship between Workflows and entities. Content Moderation needs the
+    // entity object to be able to determine the initial state based on
+    // publishing status.
+    if (!($entity instanceof ContentEntityInterface)) {
+      throw new \InvalidArgumentException('A content entity object must be supplied.');
     }
-    return parent::getInitialState($workflow);
+    if ($entity instanceof EntityPublishedInterface) {
+      return $this->getState($entity->isPublished() && !$entity->isNew() ? 'published' : 'draft');
+    }
+    // Workflows determines the initial state for non-publishable entities.
+    return parent::getInitialState();
   }
 
 }

web/core/modules/content_moderation/src/Plugin/WorkflowType/ContentModerationInterface.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\content_moderation\Plugin\WorkflowType;
+
+use Drupal\workflows\WorkflowTypeInterface;
+
+/**
+ * Interface for ContentModeration WorkflowType plugin.
+ */
+interface ContentModerationInterface extends WorkflowTypeInterface {
+
+  /**
+   * Gets the entity types the workflow is applied to.
+   *
+   * @return string[]
+   *   The entity types the workflow is applied to.
+   */
+  public function getEntityTypes();
+
+  /**
+   * Gets any bundles the workflow is applied to for the given entity type.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to get the bundles for.
+   *
+   * @return string[]
+   *   The bundles of the entity type the workflow is applied to or an empty
+   *   array if the entity type is not applied to the workflow.
+   */
+  public function getBundlesForEntityType($entity_type_id);
+
+  /**
+   * Checks if the workflow applies to the supplied entity type and bundle.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to check.
+   * @param string $bundle_id
+   *   The bundle ID to check.
+   *
+   * @return bool
+   *   TRUE if the workflow applies to the supplied entity type ID and bundle
+   *   ID. FALSE if not.
+   */
+  public function appliesToEntityTypeAndBundle($entity_type_id, $bundle_id);
+
+  /**
+   * Removes an entity type ID / bundle ID from the workflow.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to remove.
+   * @param string $bundle_id
+   *   The bundle ID to remove.
+   */
+  public function removeEntityTypeAndBundle($entity_type_id, $bundle_id);
+
+  /**
+   * Add an entity type ID / bundle ID to the workflow.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to add. It is responsibility of the caller to provide
+   *   a valid entity type ID.
+   * @param string $bundle_id
+   *   The bundle ID to add. It is responsibility of the caller to provide a
+   *   valid bundle ID.
+   */
+  public function addEntityTypeAndBundle($entity_type_id, $bundle_id);
+
+  /**
+   * {@inheritdoc}
+   *
+   * @param $entity
+   *   Content Moderation uses this parameter to determine the initial state
+   *   based on publishing status.
+   */
+  public function getInitialState($entity = NULL);
+
+}

web/core/modules/content_moderation/src/Plugin/views/filter/LatestRevision.php

@@ -1,136 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Plugin\views\filter;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\views\Plugin\views\filter\FilterPluginBase;
-use Drupal\views\Plugin\ViewsHandlerManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Filter to show only the latest revision of an entity.
- *
- * @ingroup views_filter_handlers
- *
- * @ViewsFilter("latest_revision")
- */
-class LatestRevision extends FilterPluginBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * Entity Type Manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Views Handler Plugin Manager.
-   *
-   * @var \Drupal\views\Plugin\ViewsHandlerManager
-   */
-  protected $joinHandler;
-
-  /**
-   * Database Connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * Constructs a new LatestRevision.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   Entity Type Manager Service.
-   * @param \Drupal\views\Plugin\ViewsHandlerManager $join_handler
-   *   Views Handler Plugin Manager.
-   * @param \Drupal\Core\Database\Connection $connection
-   *   Database Connection.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ViewsHandlerManager $join_handler, Connection $connection) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->entityTypeManager = $entity_type_manager;
-    $this->joinHandler = $join_handler;
-    $this->connection = $connection;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $container->get('entity_type.manager'),
-      $container->get('plugin.manager.views.join'),
-      $container->get('database')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function adminSummary() {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function operatorForm(&$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function canExpose() {
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    // The table doesn't exist until a moderated node has been saved at least
-    // once. Just in case, disable this filter until then. Note that this means
-    // the view will still show all revisions, not just latest, but this is
-    // sufficiently edge-case-y that it's probably not worth the time to
-    // handle more robustly.
-    if (!$this->connection->schema()->tableExists('content_revision_tracker')) {
-      return;
-    }
-
-    $table = $this->ensureMyTable();
-
-    /** @var \Drupal\views\Plugin\views\query\Sql $query */
-    $query = $this->query;
-
-    $definition = $this->entityTypeManager->getDefinition($this->getEntityType());
-    $keys = $definition->getKeys();
-
-    $definition = [
-      'table' => 'content_revision_tracker',
-      'type' => 'INNER',
-      'field' => 'entity_id',
-      'left_table' => $table,
-      'left_field' => $keys['id'],
-      'extra' => [
-        ['left_field' => $keys['langcode'], 'field' => 'langcode'],
-        ['left_field' => $keys['revision'], 'field' => 'revision_id'],
-        ['field' => 'entity_type', 'value' => $this->getEntityType()],
-      ],
-    ];
-
-    $join = $this->joinHandler->createInstance('standard', $definition);
-
-    $query->ensureTable('content_revision_tracker', $this->relationship, $join);
-  }
-
-}

web/core/modules/content_moderation/src/Plugin/views/filter/ModerationStateFilter.php

@@ -0,0 +1,285 @@
+<?php
+
+namespace Drupal\content_moderation\Plugin\views\filter;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Database\Query\Condition;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\views\Plugin\DependentWithRemovalPluginInterface;
+use Drupal\views\Plugin\views\filter\InOperator;
+use Drupal\views\Views;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a filter for the moderation state of an entity.
+ *
+ * @ingroup views_filter_handlers
+ *
+ * @ViewsFilter("moderation_state_filter")
+ */
+class ModerationStateFilter extends InOperator implements DependentWithRemovalPluginInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $valueFormType = 'select';
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The bundle information service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
+  /**
+   * The storage handler of the workflow entity type.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $workflowStorage;
+
+  /**
+   * Creates an instance of ModerationStateFilter.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_info, EntityStorageInterface $workflow_storage) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->entityTypeManager = $entity_type_manager;
+    $this->bundleInfo = $bundle_info;
+    $this->workflowStorage = $workflow_storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity_type.manager')->getStorage('workflow')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    return Cache::mergeTags(parent::getCacheTags(), $this->entityTypeManager->getDefinition('workflow')->getListCacheTags());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return Cache::mergeContexts(parent::getCacheContexts(), $this->entityTypeManager->getDefinition('workflow')->getListCacheContexts());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getValueOptions() {
+    if (isset($this->valueOptions)) {
+      return $this->valueOptions;
+    }
+    $this->valueOptions = [];
+
+    // Find all workflows which are moderating entity types of the same type the
+    // view is displaying.
+    foreach ($this->workflowStorage->loadByProperties(['type' => 'content_moderation']) as $workflow) {
+      /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModerationInterface $workflow_type */
+      $workflow_type = $workflow->getTypePlugin();
+      if (in_array($this->getEntityType(), $workflow_type->getEntityTypes(), TRUE)) {
+        foreach ($workflow_type->getStates() as $state_id => $state) {
+          $this->valueOptions[$workflow->label()][implode('-', [$workflow->id(), $state_id])] = $state->label();
+        }
+      }
+    }
+
+    return $this->valueOptions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function ensureMyTable() {
+    if (!isset($this->tableAlias)) {
+      $table_alias = $this->query->ensureTable($this->table, $this->relationship);
+
+      // Filter the moderation states of the content via the
+      // ContentModerationState field revision table, joining either the entity
+      // field data or revision table. This allows filtering states against
+      // either the default or latest revision, depending on the relationship of
+      // the filter.
+      $left_entity_type = $this->entityTypeManager->getDefinition($this->getEntityType());
+      $entity_type = $this->entityTypeManager->getDefinition('content_moderation_state');
+      $configuration = [
+        'table' => $entity_type->getRevisionDataTable(),
+        'field' => 'content_entity_revision_id',
+        'left_table' => $table_alias,
+        'left_field' => $left_entity_type->getKey('revision'),
+        'extra' => [
+          [
+            'field' => 'content_entity_type_id',
+            'value' => $left_entity_type->id(),
+          ],
+        ],
+      ];
+      if ($left_entity_type->isTranslatable()) {
+        $configuration['extra'][] = [
+          'field' => $entity_type->getKey('langcode'),
+          'left_field' => $left_entity_type->getKey('langcode'),
+        ];
+      }
+      $join = Views::pluginManager('join')->createInstance('standard', $configuration);
+      $this->tableAlias = $this->query->addRelationship('content_moderation_state', $join, 'content_moderation_state_field_revision');
+    }
+
+    return $this->tableAlias;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function opSimple() {
+    if (empty($this->value)) {
+      return;
+    }
+
+    $this->ensureMyTable();
+
+    $entity_type = $this->entityTypeManager->getDefinition($this->getEntityType());
+    if ($entity_type->hasKey('bundle')) {
+      // Get a list of bundles that are being moderated by the workflows
+      // configured in this filter.
+      $workflow_ids = $this->getWorkflowIds();
+      $moderated_bundles = [];
+      foreach ($this->bundleInfo->getBundleInfo($this->getEntityType()) as $bundle_id => $bundle) {
+        if (isset($bundle['workflow']) && in_array($bundle['workflow'], $workflow_ids, TRUE)) {
+          $moderated_bundles[] = $bundle_id;
+        }
+      }
+
+      // If we have a list of moderated bundles, restrict the query to show only
+      // entities in those bundles.
+      if ($moderated_bundles) {
+        $entity_base_table_alias = $this->table;
+
+        // The bundle field of an entity type is not revisionable so we need to
+        // join the base table.
+        $entity_base_table = $entity_type->getBaseTable();
+        $entity_revision_base_table = $entity_type->isTranslatable() ? $entity_type->getRevisionDataTable() : $entity_type->getRevisionTable();
+        if ($this->table === $entity_revision_base_table) {
+          $configuration = [
+            'table' => $entity_base_table,
+            'field' => $entity_type->getKey('id'),
+            'left_table' => $entity_revision_base_table,
+            'left_field' => $entity_type->getKey('id'),
+            'type' => 'INNER',
+          ];
+
+          $join = Views::pluginManager('join')->createInstance('standard', $configuration);
+          $entity_base_table_alias = $this->query->addRelationship($entity_base_table, $join, $entity_revision_base_table);
+        }
+
+        $this->query->addWhere($this->options['group'], "$entity_base_table_alias.{$entity_type->getKey('bundle')}", $moderated_bundles, 'IN');
+      }
+      // Otherwise, force the query to return an empty result.
+      else {
+        $this->query->addWhereExpression($this->options['group'], '1 = 0');
+        return;
+      }
+    }
+
+    if ($this->operator === 'in') {
+      $operator = "=";
+    }
+    else {
+      $operator = "<>";
+    }
+
+    // The values are strings composed from the workflow ID and the state ID, so
+    // we need to create a complex WHERE condition.
+    $field = new Condition('OR');
+    foreach ((array) $this->value as $value) {
+      list($workflow_id, $state_id) = explode('-', $value, 2);
+
+      $and = new Condition('AND');
+      $and
+        ->condition("$this->tableAlias.workflow", $workflow_id, '=')
+        ->condition("$this->tableAlias.$this->realField", $state_id, $operator);
+
+      $field->condition($and);
+    }
+
+    $this->query->addWhere($this->options['group'], $field);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = parent::calculateDependencies();
+
+    if ($workflow_ids = $this->getWorkflowIds()) {
+      /** @var \Drupal\workflows\WorkflowInterface $workflow */
+      foreach ($this->workflowStorage->loadMultiple($workflow_ids) as $workflow) {
+        $dependencies[$workflow->getConfigDependencyKey()][] = $workflow->getConfigDependencyName();
+      }
+    }
+
+    return $dependencies;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function onDependencyRemoval(array $dependencies) {
+    // See if this handler is responsible for any of the dependencies being
+    // removed. If this is the case, indicate that this handler needs to be
+    // removed from the View.
+    $remove = FALSE;
+    // Get all the current dependencies for this handler.
+    $current_dependencies = $this->calculateDependencies();
+    foreach ($current_dependencies as $group => $dependency_list) {
+      // Check if any of the handler dependencies match the dependencies being
+      // removed.
+      foreach ($dependency_list as $config_key) {
+        if (isset($dependencies[$group]) && array_key_exists($config_key, $dependencies[$group])) {
+          // This handlers dependency matches a dependency being removed,
+          // indicate that this handler needs to be removed.
+          $remove = TRUE;
+          break 2;
+        }
+      }
+    }
+    return $remove;
+  }
+
+  /**
+   * Gets the list of Workflow IDs configured for this filter.
+   *
+   * @return array
+   *   And array of workflow IDs.
+   */
+  protected function getWorkflowIds() {
+    $workflow_ids = [];
+    foreach ((array) $this->value as $value) {
+      list($workflow_id) = explode('-', $value, 2);
+      $workflow_ids[] = $workflow_id;
+    }
+
+    return array_unique($workflow_ids);
+  }
+
+}

web/core/modules/content_moderation/src/RevisionTracker.php

@@ -1,152 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Database\DatabaseExceptionWrapper;
-use Drupal\Core\Database\SchemaObjectExistsException;
-
-/**
- * Tracks metadata about revisions across entities.
- */
-class RevisionTracker implements RevisionTrackerInterface {
-
-  /**
-   * The name of the SQL table we use for tracking.
-   *
-   * @var string
-   */
-  protected $tableName;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * Constructs a new RevisionTracker.
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   The database connection.
-   * @param string $table
-   *   The table that should be used for tracking.
-   */
-  public function __construct(Connection $connection, $table = 'content_revision_tracker') {
-    $this->connection = $connection;
-    $this->tableName = $table;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setLatestRevision($entity_type_id, $entity_id, $langcode, $revision_id) {
-    try {
-      $this->recordLatestRevision($entity_type_id, $entity_id, $langcode, $revision_id);
-    }
-    catch (DatabaseExceptionWrapper $e) {
-      $this->ensureTableExists();
-      $this->recordLatestRevision($entity_type_id, $entity_id, $langcode, $revision_id);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Records the latest revision of a given entity.
-   *
-   * @param string $entity_type_id
-   *   The machine name of the type of entity.
-   * @param string $entity_id
-   *   The Entity ID in question.
-   * @param string $langcode
-   *   The langcode of the revision we're saving. Each language has its own
-   *   effective tree of entity revisions, so in different languages
-   *   different revisions will be "latest".
-   * @param int $revision_id
-   *   The revision ID that is now the latest revision.
-   *
-   * @return int
-   *   One of the valid returns from a merge query's execute method.
-   */
-  protected function recordLatestRevision($entity_type_id, $entity_id, $langcode, $revision_id) {
-    return $this->connection->merge($this->tableName)
-      ->keys([
-        'entity_type' => $entity_type_id,
-        'entity_id' => $entity_id,
-        'langcode' => $langcode,
-      ])
-      ->fields([
-        'revision_id' => $revision_id,
-      ])
-      ->execute();
-  }
-
-  /**
-   * Checks if the table exists and create it if not.
-   *
-   * @return bool
-   *   TRUE if the table was created, FALSE otherwise.
-   */
-  protected function ensureTableExists() {
-    try {
-      if (!$this->connection->schema()->tableExists($this->tableName)) {
-        $this->connection->schema()->createTable($this->tableName, $this->schemaDefinition());
-        return TRUE;
-      }
-    }
-    catch (SchemaObjectExistsException $e) {
-      // If another process has already created the table, attempting to
-      // recreate it will throw an exception. In this case just catch the
-      // exception and do nothing.
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * Defines the schema for the tracker table.
-   *
-   * @return array
-   *   The schema API definition for the SQL storage table.
-   */
-  protected function schemaDefinition() {
-    $schema = [
-      'description' => 'Tracks the latest revision for any entity',
-      'fields' => [
-        'entity_type' => [
-          'description' => 'The entity type',
-          'type' => 'varchar_ascii',
-          'length' => 255,
-          'not null' => TRUE,
-          'default' => '',
-        ],
-        'entity_id' => [
-          'description' => 'The entity ID',
-          'type' => 'int',
-          'length' => 255,
-          'not null' => TRUE,
-          'default' => 0,
-        ],
-        'langcode' => [
-          'description' => 'The language of the entity revision',
-          'type' => 'varchar',
-          'length' => 12,
-          'not null' => TRUE,
-          'default' => '',
-        ],
-        'revision_id' => [
-          'description' => 'The latest revision ID for this entity',
-          'type' => 'int',
-          'not null' => TRUE,
-          'default' => 0,
-        ],
-      ],
-      'primary key' => ['entity_type', 'entity_id', 'langcode'],
-    ];
-
-    return $schema;
-  }
-
-}

web/core/modules/content_moderation/src/RevisionTrackerInterface.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-/**
- * Tracks metadata about revisions across content entities.
- */
-interface RevisionTrackerInterface {
-
-  /**
-   * Sets the latest revision of a given entity.
-   *
-   * @param string $entity_type_id
-   *   The machine name of the type of entity.
-   * @param string $entity_id
-   *   The Entity ID in question.
-   * @param string $langcode
-   *   The langcode of the revision we're saving. Each language has its own
-   *   effective tree of entity revisions, so in different languages
-   *   different revisions will be "latest".
-   * @param int $revision_id
-   *   The revision ID that is now the latest revision.
-   *
-   * @return static
-   */
-  public function setLatestRevision($entity_type_id, $entity_id, $langcode, $revision_id);
-
-}

web/core/modules/content_moderation/src/Routing/ContentModerationRouteSubscriber.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Drupal\content_moderation\Routing;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Drupal\Core\Routing\RoutingEvents;
+use Drupal\workflows\Entity\Workflow;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Subscriber for moderated revisionable entity forms.
+ *
+ * @internal
+ *   There is ongoing discussion about how pending revisions should behave.
+ *   The logic enabling pending revision support is likely to change once a
+ *   decision is made.
+ *
+ * @see https://www.drupal.org/node/2940575
+ */
+class ContentModerationRouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * An associative array of moderated entity types keyed by ID.
+   *
+   * @var \Drupal\Core\Entity\ContentEntityTypeInterface[]
+   */
+  protected $moderatedEntityTypes;
+
+  /**
+   * ContentModerationRouteSubscriber constructor.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    foreach ($collection as $route) {
+      $this->setLatestRevisionFlag($route);
+    }
+  }
+
+  /**
+   * Ensure revisionable entities load the latest revision on entity forms.
+   *
+   * @param \Symfony\Component\Routing\Route $route
+   *   The route object.
+   */
+  protected function setLatestRevisionFlag(Route $route) {
+    if (!$entity_form = $route->getDefault('_entity_form')) {
+      return;
+    }
+    // Only set the flag on entity types which are revisionable.
+    list($entity_type) = explode('.', $entity_form, 2);
+    if (!isset($this->getModeratedEntityTypes()[$entity_type]) || !$this->getModeratedEntityTypes()[$entity_type]->isRevisionable()) {
+      return;
+    }
+    $parameters = $route->getOption('parameters') ?: [];
+    foreach ($parameters as &$parameter) {
+      if ($parameter['type'] === 'entity:' . $entity_type && !isset($parameter['load_latest_revision'])) {
+        $parameter['load_latest_revision'] = TRUE;
+      }
+    }
+    $route->setOption('parameters', $parameters);
+  }
+
+  /**
+   * Returns the moderated entity types.
+   *
+   * @return \Drupal\Core\Entity\ContentEntityTypeInterface[]
+   *   An associative array of moderated entity types keyed by ID.
+   */
+  protected function getModeratedEntityTypes() {
+    if (!isset($this->moderatedEntityTypes)) {
+      $entity_types = $this->entityTypeManager->getDefinitions();
+      /** @var \Drupal\workflows\WorkflowInterface $workflow */
+      foreach (Workflow::loadMultipleByType('content_moderation') as $workflow) {
+        /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $plugin */
+        $plugin = $workflow->getTypePlugin();
+        foreach ($plugin->getEntityTypes() as $entity_type_id) {
+          $this->moderatedEntityTypes[$entity_type_id] = $entity_types[$entity_type_id];
+        }
+      }
+    }
+    return $this->moderatedEntityTypes;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events = parent::getSubscribedEvents();
+    // This needs to run after that EntityResolverManager has set the route
+    // entity type.
+    $events[RoutingEvents::ALTER] = ['onAlterRoutes', -200];
+    return $events;
+  }
+
+}

web/core/modules/content_moderation/src/Routing/EntityTypeModerationRouteProvider.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Routing;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Routing\EntityRouteProviderInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Provides the moderation configuration routes for config entities.
- */
-class EntityTypeModerationRouteProvider implements EntityRouteProviderInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoutes(EntityTypeInterface $entity_type) {
-    $collection = new RouteCollection();
-
-    if ($moderation_route = $this->getModerationFormRoute($entity_type)) {
-      $entity_type_id = $entity_type->id();
-      $collection->add("entity.{$entity_type_id}.moderation", $moderation_route);
-    }
-
-    return $collection;
-  }
-
-  /**
-   * Gets the moderation-form route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getModerationFormRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('moderation-form') && $entity_type->getFormClass('moderation')) {
-      $entity_type_id = $entity_type->id();
-
-      $route = new Route($entity_type->getLinkTemplate('moderation-form'));
-
-      // @todo Come up with a new permission.
-      $route
-        ->setDefaults([
-          '_entity_form' => "{$entity_type_id}.moderation",
-          '_title' => 'Moderation',
-        ])
-        ->setRequirement('_permission', 'administer content moderation')
-        ->setOption('parameters', [
-          $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-        ]);
-
-      return $route;
-    }
-  }
-
-}

web/core/modules/content_moderation/src/StateTransitionValidation.php

@@ -4,7 +4,9 @@ namespace Drupal\content_moderation;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\workflows\StateInterface;
 use Drupal\workflows\Transition;
+use Drupal\workflows\WorkflowInterface;
 
 /**
  * Validates whether a certain state transition is allowed.
@@ -40,11 +42,19 @@ class StateTransitionValidation implements StateTransitionValidationInterface {
    */
   public function getValidTransitions(ContentEntityInterface $entity, AccountInterface $user) {
     $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
-    $current_state = $entity->moderation_state->value ? $workflow->getState($entity->moderation_state->value) : $workflow->getTypePlugin()->getInitialState($workflow, $entity);
+    $current_state = $entity->moderation_state->value ? $workflow->getTypePlugin()->getState($entity->moderation_state->value) : $workflow->getTypePlugin()->getInitialState($entity);
 
-    return array_filter($current_state->getTransitions(), function(Transition $transition) use ($workflow, $user) {
+    return array_filter($current_state->getTransitions(), function (Transition $transition) use ($workflow, $user) {
       return $user->hasPermission('use ' . $workflow->id() . ' transition ' . $transition->id());
     });
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function isTransitionValid(WorkflowInterface $workflow, StateInterface $original_state, StateInterface $new_state, AccountInterface $user) {
+    $transition = $workflow->getTypePlugin()->getTransitionFromStateToState($original_state->id(), $new_state->id());
+    return $user->hasPermission('use ' . $workflow->id() . ' transition ' . $transition->id());
+  }
+
 }

web/core/modules/content_moderation/src/StateTransitionValidationInterface.php

@@ -4,6 +4,8 @@ namespace Drupal\content_moderation;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\workflows\StateInterface;
+use Drupal\workflows\WorkflowInterface;
 
 /**
  * Validates whether a certain state transition is allowed.
@@ -23,4 +25,21 @@ interface StateTransitionValidationInterface {
    */
   public function getValidTransitions(ContentEntityInterface $entity, AccountInterface $user);
 
+  /**
+   * Checks if a transition between two states if valid for the given user.
+   *
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow entity.
+   * @param \Drupal\workflows\StateInterface $original_state
+   *   The original workflow state.
+   * @param \Drupal\workflows\StateInterface $new_state
+   *   The new workflow state.
+   * @param \Drupal\Core\Session\AccountInterface $user
+   *   The user to validate.
+   *
+   * @return bool
+   *   Returns TRUE if transition is valid, otherwise FALSE.
+   */
+  public function isTransitionValid(WorkflowInterface $workflow, StateInterface $original_state, StateInterface $new_state, AccountInterface $user);
+
 }

web/core/modules/content_moderation/src/ViewsData.php

@@ -8,6 +8,8 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Provides the content_moderation views integration.
+ *
+ * @internal
  */
 class ViewsData {
 
@@ -49,137 +51,13 @@ class ViewsData {
   public function getViewsData() {
     $data = [];
 
-    $data['content_revision_tracker']['table']['group'] = $this->t('Content moderation (tracker)');
-
-    $data['content_revision_tracker']['entity_type'] = [
-      'title' => $this->t('Entity type'),
-      'field' => [
-        'id' => 'standard',
-      ],
-      'filter' => [
-        'id' => 'string',
-      ],
-      'argument' => [
-        'id' => 'string',
-      ],
-      'sort' => [
-        'id' => 'standard',
-      ],
-    ];
-
-    $data['content_revision_tracker']['entity_id'] = [
-      'title' => $this->t('Entity ID'),
-      'field' => [
-        'id' => 'standard',
-      ],
-      'filter' => [
-        'id' => 'numeric',
-      ],
-      'argument' => [
-        'id' => 'numeric',
-      ],
-      'sort' => [
-        'id' => 'standard',
-      ],
-    ];
-
-    $data['content_revision_tracker']['langcode'] = [
-      'title' => $this->t('Entity language'),
-      'field' => [
-        'id' => 'standard',
-      ],
-      'filter' => [
-        'id' => 'language',
-      ],
-      'argument' => [
-        'id' => 'language',
-      ],
-      'sort' => [
-        'id' => 'standard',
-      ],
-    ];
-
-    $data['content_revision_tracker']['revision_id'] = [
-      'title' => $this->t('Latest revision ID'),
-      'field' => [
-        'id' => 'standard',
-      ],
-      'filter' => [
-        'id' => 'numeric',
-      ],
-      'argument' => [
-        'id' => 'numeric',
-      ],
-      'sort' => [
-        'id' => 'standard',
-      ],
-    ];
-
     $entity_types_with_moderation = array_filter($this->entityTypeManager->getDefinitions(), function (EntityTypeInterface $type) {
       return $this->moderationInformation->canModerateEntitiesOfEntityType($type);
     });
 
-    // Add a join for each entity type to the content_revision_tracker table.
-    foreach ($entity_types_with_moderation as $entity_type_id => $entity_type) {
-      /** @var \Drupal\views\EntityViewsDataInterface $views_data */
-      // We need the views_data handler in order to get the table name later.
-      if ($this->entityTypeManager->hasHandler($entity_type_id, 'views_data') && $views_data = $this->entityTypeManager->getHandler($entity_type_id, 'views_data')) {
-        // Add a join from the entity base table to the revision tracker table.
-        $base_table = $views_data->getViewsTableForEntityType($entity_type);
-        $data['content_revision_tracker']['table']['join'][$base_table] = [
-          'left_field' => $entity_type->getKey('id'),
-          'field' => 'entity_id',
-          'extra' => [
-            [
-              'field' => 'entity_type',
-              'value' => $entity_type_id,
-            ],
-          ],
-        ];
-
-        // Some entity types might not be translatable.
-        if ($entity_type->hasKey('langcode')) {
-          $data['content_revision_tracker']['table']['join'][$base_table]['extra'][] = [
-            'field' => 'langcode',
-            'left_field' => $entity_type->getKey('langcode'),
-            'operation' => '=',
-          ];
-        }
-
-        // Add a relationship between the revision tracker table to the latest
-        // revision on the entity revision table.
-        $data['content_revision_tracker']['latest_revision__' . $entity_type_id] = [
-          'title' => $this->t('@label latest revision', ['@label' => $entity_type->getLabel()]),
-          'group' => $this->t('@label revision', ['@label' => $entity_type->getLabel()]),
-          'relationship' => [
-            'id' => 'standard',
-            'label' => $this->t('@label latest revision', ['@label' => $entity_type->getLabel()]),
-            'base' => $this->getRevisionViewsTableForEntityType($entity_type),
-            'base field' => $entity_type->getKey('revision'),
-            'relationship field' => 'revision_id',
-            'extra' => [
-              [
-                'left_field' => 'entity_type',
-                'value' => $entity_type_id,
-              ],
-            ],
-          ],
-        ];
-
-        // Some entity types might not be translatable.
-        if ($entity_type->hasKey('langcode')) {
-          $data['content_revision_tracker']['latest_revision__' . $entity_type_id]['relationship']['extra'][] = [
-            'left_field' => 'langcode',
-            'field' => $entity_type->getKey('langcode'),
-            'operation' => '=',
-          ];
-        }
-      }
-    }
-
     // Provides a relationship from moderated entity to its moderation state
     // entity.
-    $content_moderation_state_entity_type = \Drupal::entityTypeManager()->getDefinition('content_moderation_state');
+    $content_moderation_state_entity_type = $this->entityTypeManager->getDefinition('content_moderation_state');
     $content_moderation_state_entity_base_table = $content_moderation_state_entity_type->getDataTable() ?: $content_moderation_state_entity_type->getBaseTable();
     $content_moderation_state_entity_revision_base_table = $content_moderation_state_entity_type->getRevisionDataTable() ?: $content_moderation_state_entity_type->getRevisionTable();
     foreach ($entity_types_with_moderation as $entity_type_id => $entity_type) {
@@ -200,7 +78,12 @@ class ViewsData {
             ],
           ],
         ],
-        'field' => ['default_formatter' => 'content_moderation_state'],
+        'field' => [
+          'id' => 'field',
+          'default_formatter' => 'content_moderation_state',
+          'field_name' => 'moderation_state',
+        ],
+        'filter' => ['id' => 'moderation_state_filter', 'allow empty' => TRUE],
       ];
 
       $revision_table = $entity_type->getRevisionDataTable() ?: $entity_type->getRevisionTable();
@@ -219,46 +102,16 @@ class ViewsData {
             ],
           ],
         ],
-        'field' => ['default_formatter' => 'content_moderation_state'],
+        'field' => [
+          'id' => 'field',
+          'default_formatter' => 'content_moderation_state',
+          'field_name' => 'moderation_state',
+        ],
+        'filter' => ['id' => 'moderation_state_filter', 'allow empty' => TRUE],
       ];
     }
 
     return $data;
   }
 
-  /**
-   * Alters the table and field information from hook_views_data().
-   *
-   * @param array $data
-   *   An array of all information about Views tables and fields, collected from
-   *   hook_views_data(), passed by reference.
-   *
-   * @see hook_views_data()
-   */
-  public function alterViewsData(array &$data) {
-    $entity_types_with_moderation = array_filter($this->entityTypeManager->getDefinitions(), function (EntityTypeInterface $type) {
-      return $this->moderationInformation->canModerateEntitiesOfEntityType($type);
-    });
-    foreach ($entity_types_with_moderation as $type) {
-      $data[$type->getRevisionTable()]['latest_revision'] = [
-        'title' => t('Is Latest Revision'),
-        'help' => t('Restrict the view to only revisions that are the latest revision of their entity.'),
-        'filter' => ['id' => 'latest_revision'],
-      ];
-    }
-  }
-
-  /**
-   * Gets the table of an entity type to be used as revision table in views.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return string
-   *   The revision base table.
-   */
-  protected function getRevisionViewsTableForEntityType(EntityTypeInterface $entity_type) {
-    return $entity_type->getRevisionDataTable() ?: $entity_type->getRevisionTable();
-  }
-
 }

web/core/modules/content_moderation/templates/entity-moderation-form.html.twig

@@ -1,8 +1,7 @@
-{{ attach_library('content_moderation/content_moderation') }}
 <ul class="entity-moderation-form">
-  <li>{{ form.current }}</li>
-  <li>{{ form.new_state }}</li>
-  <li>{{ form.revision_log }}</li>
-  <li>{{ form.submit }}</li>
+  <li class="entity-moderation-form__item">{{ form.current }}</li>
+  <li class="entity-moderation-form__item">{{ form.new_state }}</li>
+  <li class="entity-moderation-form__item">{{ form.revision_log }}</li>
+  <li class="entity-moderation-form__item">{{ form.submit }}</li>
 </ul>
 {{ form|without('current', 'new_state', 'revision_log', 'submit') }}

web/core/modules/content_moderation/tests/fixtures/update/drupal-8.default-cms-entity-id-2941736.php

@@ -0,0 +1,804 @@
+<?php
+// @codingStandardsIgnoreFile
+/**
+ * @file
+ * Content for the update path test in #2941736.
+ *
+ * @see \Drupal\Tests\content_moderation\Functional\DefaultContentModerationStateRevisionUpdateTest.
+ */
+
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+$connection->insert('block_content')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'type',
+    'uuid',
+    'langcode',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '1',
+    'type' => 'test_block_content',
+    'uuid' => '811fac6c-8184-4de5-99eb-9e70d28709f4',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'type' => 'test_block_content',
+    'uuid' => 'b89f025c-0538-4075-bd8e-96acf74211c9',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'type' => 'test_block_content',
+    'uuid' => '62e428e1-88a6-478c-a8c6-a554ca2332ae',
+    'langcode' => 'en',
+  ))
+  ->execute();
+
+$connection->insert('block_content_field_data')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'type',
+    'langcode',
+    'info',
+    'changed',
+    'default_langcode',
+    'revision_translation_affected',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '1',
+    'type' => 'test_block_content',
+    'langcode' => 'en',
+    'info' => 'draft pending revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'type' => 'test_block_content',
+    'langcode' => 'en',
+    'info' => 'published default revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'type' => 'test_block_content',
+    'langcode' => 'en',
+    'info' => 'archived default revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->execute();
+
+$connection->insert('block_content_field_revision')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'langcode',
+    'info',
+    'changed',
+    'default_langcode',
+    'revision_translation_affected',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '1',
+    'langcode' => 'en',
+    'info' => 'draft pending revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '2',
+    'langcode' => 'en',
+    'info' => 'draft pending revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'langcode' => 'en',
+    'info' => 'published default revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '4',
+    'langcode' => 'en',
+    'info' => 'archived default revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'langcode' => 'en',
+    'info' => 'archived default revision',
+    'changed' => '1517725800',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->execute();
+
+$connection->insert('block_content_revision')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'langcode',
+    'revision_user',
+    'revision_created',
+    'revision_log',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '1',
+    'langcode' => 'en',
+    'revision_user' => NULL,
+    'revision_created' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '2',
+    'langcode' => 'en',
+    'revision_user' => NULL,
+    'revision_created' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'langcode' => 'en',
+    'revision_user' => NULL,
+    'revision_created' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '4',
+    'langcode' => 'en',
+    'revision_user' => NULL,
+    'revision_created' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'langcode' => 'en',
+    'revision_user' => NULL,
+    'revision_created' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->execute();
+
+$connection->delete('config')
+  ->condition('name', ['workflows.workflow.editorial'], 'IN')
+  ->execute();
+
+$connection->insert('config')
+  ->fields(array(
+    'collection',
+    'name',
+    'data',
+  ))
+  ->values(array(
+    'collection' => '',
+    'name' => 'block_content.type.test_block_content',
+    'data' => 'a:8:{s:4:"uuid";s:36:"966baba6-525e-48fe-b8c5-a5f131b1857f";s:8:"langcode";s:2:"en";s:6:"status";b:1;s:12:"dependencies";a:0:{}s:2:"id";s:18:"test_block_content";s:5:"label";s:18:"Test Block Content";s:8:"revision";N;s:11:"description";N;}',
+  ))
+  ->values(array(
+    'collection' => '',
+    'name' => 'workflows.workflow.editorial',
+    'data' => 'a:9:{s:4:"uuid";s:36:"08b548c7-ff59-468b-9347-7d697680d035";s:8:"langcode";s:2:"en";s:6:"status";b:1;s:12:"dependencies";a:2:{s:6:"config";a:2:{i:0;s:37:"block_content.type.test_block_content";i:1;s:17:"node.type.article";}s:6:"module";a:1:{i:0;s:18:"content_moderation";}}s:5:"_core";a:1:{s:19:"default_config_hash";s:43:"T_JxNjYlfoRBi7Bj1zs5Xv9xv1btuBkKp5C1tNrjMhI";}s:2:"id";s:9:"editorial";s:5:"label";s:9:"Editorial";s:4:"type";s:18:"content_moderation";s:13:"type_settings";a:3:{s:6:"states";a:3:{s:8:"archived";a:4:{s:5:"label";s:8:"Archived";s:6:"weight";i:5;s:9:"published";b:0;s:16:"default_revision";b:1;}s:5:"draft";a:4:{s:5:"label";s:5:"Draft";s:9:"published";b:0;s:16:"default_revision";b:0;s:6:"weight";i:-5;}s:9:"published";a:4:{s:5:"label";s:9:"Published";s:9:"published";b:1;s:16:"default_revision";b:1;s:6:"weight";i:0;}}s:11:"transitions";a:5:{s:7:"archive";a:4:{s:5:"label";s:7:"Archive";s:4:"from";a:1:{i:0;s:9:"published";}s:2:"to";s:8:"archived";s:6:"weight";i:2;}s:14:"archived_draft";a:4:{s:5:"label";s:16:"Restore to Draft";s:4:"from";a:1:{i:0;s:8:"archived";}s:2:"to";s:5:"draft";s:6:"weight";i:3;}s:18:"archived_published";a:4:{s:5:"label";s:7:"Restore";s:4:"from";a:1:{i:0;s:8:"archived";}s:2:"to";s:9:"published";s:6:"weight";i:4;}s:16:"create_new_draft";a:4:{s:5:"label";s:16:"Create New Draft";s:2:"to";s:5:"draft";s:6:"weight";i:0;s:4:"from";a:2:{i:0;s:5:"draft";i:1;s:9:"published";}}s:7:"publish";a:4:{s:5:"label";s:7:"Publish";s:2:"to";s:9:"published";s:6:"weight";i:1;s:4:"from";a:2:{i:0;s:5:"draft";i:1;s:9:"published";}}}s:12:"entity_types";a:2:{s:13:"block_content";a:1:{i:0;s:18:"test_block_content";}s:4:"node";a:1:{i:0;s:7:"article";}}}}',
+  ))
+  ->execute();
+
+$connection->insert('content_moderation_state')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'uuid',
+    'langcode',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '2',
+    'uuid' => '3ce04732-f65f-4937-aa49-821f5842ae06',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'uuid' => 'a6507b55-3001-4748-8d32-f4fa47319754',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'uuid' => '112d2bd2-552b-4e2f-9a6d-526740ba1b38',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '4',
+    'revision_id' => '7',
+    'uuid' => 'a85d0d06-e046-4509-b9b4-75d78dcdd91e',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '5',
+    'revision_id' => '8',
+    'uuid' => '3797f5de-116b-4d75-b7e3-5206e6f97c41',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '6',
+    'revision_id' => '10',
+    'uuid' => '8d9b11c1-8ddf-4c61-bb8d-9ac724e28d9e',
+    'langcode' => 'en',
+  ))
+  ->execute();
+
+$connection->insert('content_moderation_state_field_data')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'langcode',
+    'uid',
+    'workflow',
+    'moderation_state',
+    'content_entity_type_id',
+    'content_entity_id',
+    'content_entity_revision_id',
+    'default_langcode',
+    'revision_translation_affected',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '2',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'draft',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '1',
+    'content_entity_revision_id' => '2',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '2',
+    'content_entity_revision_id' => '3',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'archived',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '3',
+    'content_entity_revision_id' => '5',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '4',
+    'revision_id' => '7',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'draft',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '1',
+    'content_entity_revision_id' => '2',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '5',
+    'revision_id' => '8',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '2',
+    'content_entity_revision_id' => '3',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '6',
+    'revision_id' => '10',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'archived',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '3',
+    'content_entity_revision_id' => '5',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->execute();
+
+$connection->insert('content_moderation_state_field_revision')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'langcode',
+    'uid',
+    'workflow',
+    'moderation_state',
+    'content_entity_type_id',
+    'content_entity_id',
+    'content_entity_revision_id',
+    'default_langcode',
+    'revision_translation_affected',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '1',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '1',
+    'content_entity_revision_id' => '1',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '2',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'draft',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '1',
+    'content_entity_revision_id' => '2',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '2',
+    'content_entity_revision_id' => '3',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '4',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '3',
+    'content_entity_revision_id' => '4',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'archived',
+    'content_entity_type_id' => 'node',
+    'content_entity_id' => '3',
+    'content_entity_revision_id' => '5',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '4',
+    'revision_id' => '6',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '1',
+    'content_entity_revision_id' => '1',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '4',
+    'revision_id' => '7',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'draft',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '1',
+    'content_entity_revision_id' => '2',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '5',
+    'revision_id' => '8',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '2',
+    'content_entity_revision_id' => '3',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '6',
+    'revision_id' => '9',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'published',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '3',
+    'content_entity_revision_id' => '4',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'id' => '6',
+    'revision_id' => '10',
+    'langcode' => 'en',
+    'uid' => '0',
+    'workflow' => 'editorial',
+    'moderation_state' => 'archived',
+    'content_entity_type_id' => 'block_content',
+    'content_entity_id' => '3',
+    'content_entity_revision_id' => '5',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->execute();
+
+$connection->insert('content_moderation_state_revision')
+  ->fields(array(
+    'id',
+    'revision_id',
+    'langcode',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '1',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '1',
+    'revision_id' => '2',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '2',
+    'revision_id' => '3',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '4',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '3',
+    'revision_id' => '5',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '4',
+    'revision_id' => '6',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '4',
+    'revision_id' => '7',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '5',
+    'revision_id' => '8',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '6',
+    'revision_id' => '9',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'id' => '6',
+    'revision_id' => '10',
+    'langcode' => 'en',
+  ))
+  ->execute();
+
+$connection->insert('key_value')
+  ->fields(array(
+    'collection',
+    'name',
+    'value',
+  ))
+  ->values(array(
+    'collection' => 'config.entity.key_store.block_content_type',
+    'name' => 'uuid:966baba6-525e-48fe-b8c5-a5f131b1857f',
+    'value' => 'a:1:{i:0;s:37:"block_content.type.test_block_content";}',
+  ))
+  ->execute();
+
+$connection->insert('node')
+  ->fields(array(
+    'nid',
+    'vid',
+    'type',
+    'uuid',
+    'langcode',
+  ))
+  ->values(array(
+    'nid' => '1',
+    'vid' => '1',
+    'type' => 'article',
+    'uuid' => '11143847-fe18-4808-a797-8b15966adf4c',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'nid' => '2',
+    'vid' => '3',
+    'type' => 'article',
+    'uuid' => '336e6941-9340-419e-a763-65d4c11ea031',
+    'langcode' => 'en',
+  ))
+  ->values(array(
+    'nid' => '3',
+    'vid' => '5',
+    'type' => 'article',
+    'uuid' => '3eebe337-f977-4a32-94d2-4095947f125d',
+    'langcode' => 'en',
+  ))
+  ->execute();
+
+$connection->insert('node_field_data')
+  ->fields(array(
+    'nid',
+    'vid',
+    'type',
+    'langcode',
+    'status',
+    'title',
+    'uid',
+    'created',
+    'changed',
+    'promote',
+    'sticky',
+    'default_langcode',
+    'revision_translation_affected',
+  ))
+  ->values(array(
+    'nid' => '1',
+    'vid' => '1',
+    'type' => 'article',
+    'langcode' => 'en',
+    'status' => '1',
+    'title' => 'draft pending revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'nid' => '2',
+    'vid' => '3',
+    'type' => 'article',
+    'langcode' => 'en',
+    'status' => '1',
+    'title' => 'published default revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'nid' => '3',
+    'vid' => '5',
+    'type' => 'article',
+    'langcode' => 'en',
+    'status' => '0',
+    'title' => 'archived default revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->execute();
+
+$connection->insert('node_field_revision')
+  ->fields(array(
+    'nid',
+    'vid',
+    'langcode',
+    'status',
+    'title',
+    'uid',
+    'created',
+    'changed',
+    'promote',
+    'sticky',
+    'default_langcode',
+    'revision_translation_affected',
+  ))
+  ->values(array(
+    'nid' => '1',
+    'vid' => '1',
+    'langcode' => 'en',
+    'status' => '1',
+    'title' => 'draft pending revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'nid' => '1',
+    'vid' => '2',
+    'langcode' => 'en',
+    'status' => '0',
+    'title' => 'draft pending revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'nid' => '2',
+    'vid' => '3',
+    'langcode' => 'en',
+    'status' => '1',
+    'title' => 'published default revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'nid' => '3',
+    'vid' => '4',
+    'langcode' => 'en',
+    'status' => '1',
+    'title' => 'archived default revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->values(array(
+    'nid' => '3',
+    'vid' => '5',
+    'langcode' => 'en',
+    'status' => '0',
+    'title' => 'archived default revision',
+    'uid' => '0',
+    'created' => '1517725800',
+    'changed' => '1517725800',
+    'promote' => '1',
+    'sticky' => '0',
+    'default_langcode' => '1',
+    'revision_translation_affected' => '1',
+  ))
+  ->execute();
+
+$connection->insert('node_revision')
+  ->fields(array(
+    'nid',
+    'vid',
+    'langcode',
+    'revision_uid',
+    'revision_timestamp',
+    'revision_log',
+  ))
+  ->values(array(
+    'nid' => '1',
+    'vid' => '1',
+    'langcode' => 'en',
+    'revision_uid' => '0',
+    'revision_timestamp' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'nid' => '1',
+    'vid' => '2',
+    'langcode' => 'en',
+    'revision_uid' => '0',
+    'revision_timestamp' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'nid' => '2',
+    'vid' => '3',
+    'langcode' => 'en',
+    'revision_uid' => '0',
+    'revision_timestamp' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'nid' => '3',
+    'vid' => '4',
+    'langcode' => 'en',
+    'revision_uid' => '0',
+    'revision_timestamp' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->values(array(
+    'nid' => '3',
+    'vid' => '5',
+    'langcode' => 'en',
+    'revision_uid' => '0',
+    'revision_timestamp' => '1517725800',
+    'revision_log' => NULL,
+  ))
+  ->execute();

web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.info.yml

@@ -5,5 +5,5 @@ package: Testing
 version: VERSION
 core: 8.x
 dependencies:
-  - content_moderation
-  - node
+  - drupal:content_moderation
+  - drupal:node

web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml

@@ -0,0 +1,205 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - content_moderation
+    - node
+    - user
+id: test_content_moderation_field_state_test
+label: test_content_moderation_field_state_test
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: some
+        options:
+          items_per_page: 10
+          offset: 0
+      style:
+        type: default
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          label: ''
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          settings:
+            link_to_entity: true
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        moderation_state:
+          id: moderation_state
+          table: node_field_data
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: content_moderation_state
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          plugin_id: field
+      filters: {  }
+      sorts: {  }
+      title: test_content_moderation_field_state_test
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: test-content-moderation-field-state-test
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }

web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml

@@ -1,447 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - user
-id: test_content_moderation_latest_revision
-label: test_content_moderation_latest_revision
-module: views
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-core: 8.x
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 10
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
-      fields:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: node
-          entity_field: nid
-          plugin_id: field
-        revision_id:
-          id: revision_id
-          table: content_revision_tracker
-          field: revision_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: standard
-        title:
-          id: title
-          table: node_field_revision
-          field: title
-          relationship: latest_revision__node
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-        moderation_state:
-          id: moderation_state
-          table: content_moderation_state_field_revision
-          field: moderation_state
-          relationship: moderation_state
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: string
-          settings: {  }
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: content_moderation_state
-          entity_field: moderation_state
-          plugin_id: field
-        moderation_state_1:
-          id: moderation_state_1
-          table: content_moderation_state_field_revision
-          field: moderation_state
-          relationship: moderation_state_1
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: string
-          settings: {  }
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: content_moderation_state
-          entity_field: moderation_state
-          plugin_id: field
-      filters: {  }
-      sorts:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: standard
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships:
-        latest_revision__node:
-          id: latest_revision__node
-          table: content_revision_tracker
-          field: latest_revision__node
-          relationship: none
-          group_type: group
-          admin_label: 'Content latest revision'
-          required: false
-          plugin_id: standard
-        moderation_state_1:
-          id: moderation_state_1
-          table: node_field_revision
-          field: moderation_state
-          relationship: latest_revision__node
-          group_type: group
-          admin_label: 'Content moderation state (latest revision)'
-          required: false
-          entity_type: node
-          plugin_id: standard
-        moderation_state:
-          id: moderation_state
-          table: node_field_revision
-          field: moderation_state
-          relationship: none
-          group_type: group
-          admin_label: 'Content moderation state'
-          required: false
-          entity_type: node
-          plugin_id: standard
-      arguments: {  }
-      display_extenders: {  }
-      rendering_language: '***LANGUAGE_entity_default***'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }

web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml

@@ -0,0 +1,260 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - content_moderation
+    - node
+    - user
+id: test_content_moderation_state_filter_base_table
+label: test_content_moderation_state_filter_base_table
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: none
+        options:
+          offset: 0
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        nid:
+          id: nid
+          table: node_field_data
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: field
+      filters:
+        moderation_state:
+          id: moderation_state
+          table: node_field_data
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: moderation_state_op
+            label: 'Default Revision State'
+            description: ''
+            use_operator: false
+            operator: moderation_state_op
+            identifier: default_revision_state
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: moderation_state_filter
+        moderation_state_1:
+          id: moderation_state_1
+          table: node_field_data
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: 'not empty'
+          value: {  }
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: moderation_state_filter
+      sorts:
+        nid:
+          id: nid
+          table: node_field_data
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          entity_type: node
+          entity_field: nid
+          plugin_id: standard
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:workflow_list'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: filter-test-path
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:workflow_list'

web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml

@@ -0,0 +1,222 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - content_moderation
+    - node
+    - user
+id: test_content_moderation_state_filter_base_table_filter_on_revision
+label: test_content_moderation_state_filter_base_table_filter_on_revision
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: none
+        options:
+          offset: 0
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        nid:
+          id: nid
+          table: node_field_data
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: field
+      filters:
+        moderation_state:
+          id: moderation_state
+          table: node_field_revision
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: moderation_state_op
+            label: 'Moderation state'
+            description: ''
+            use_operator: false
+            operator: moderation_state_op
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: moderation_state_filter
+      sorts:
+        nid:
+          id: nid
+          table: node_field_data
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          entity_type: node
+          entity_field: nid
+          plugin_id: standard
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:workflow_list'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: filter-on-revision-test-path
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:workflow_list'

web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml

@@ -0,0 +1,167 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - content_moderation
+    - entity_test
+id: test_content_moderation_state_filter_entity_test
+label: test_content_moderation_state_filter_entity_test
+module: views
+description: ''
+tag: ''
+base_table: entity_test_no_bundle
+base_field: id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: none
+        options:
+          offset: 0
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        entity_id:
+          id: entity_id
+          table: content_revision_tracker
+          field: entity_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: standard
+      filters:
+        moderation_state:
+          id: moderation_state
+          table: entity_test_no_bundle
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: moderation_state_op
+            label: 'Moderation state'
+            description: ''
+            use_operator: false
+            operator: moderation_state_op
+            identifier: moderation_state
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: entity_test_no_bundle
+          plugin_id: moderation_state_filter
+      sorts: {  }
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_interface'
+        - url
+      tags: {  }

web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml

@@ -0,0 +1,217 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - content_moderation
+    - user
+id: test_content_moderation_state_filter_revision_table
+label: test_content_moderation_state_filter_revision_table
+module: views
+description: ''
+tag: ''
+base_table: node_field_revision
+base_field: vid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'view all revisions'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        nid:
+          id: nid
+          table: node_field_revision
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: field
+      filters:
+        moderation_state:
+          id: moderation_state
+          table: node_field_revision
+          field: moderation_state
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: moderation_state_op
+            label: 'Moderation state'
+            description: ''
+            use_operator: false
+            operator: moderation_state_op
+            identifier: moderation_state
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: moderation_state_filter
+      sorts:
+        vid:
+          id: vid
+          table: node_field_revision
+          field: vid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          entity_type: node
+          entity_field: vid
+          plugin_id: standard
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }

web/core/modules/content_moderation/tests/modules/content_moderation_test_views/content_moderation_test_views.info.yml

@@ -5,6 +5,7 @@ package: Testing
 version: VERSION
 core: 8.x
 dependencies:
-  - content_moderation
-  - node
-  - views
+  - drupal:content_moderation
+  - drupal:node
+  - drupal:views
+  - drupal:entity_test

web/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php

@@ -19,6 +19,7 @@ class ContentModerationWorkflowTypeTest extends BrowserTestBase {
   public static $modules = [
     'content_moderation',
     'node',
+    'entity_test',
   ];
 
   /**
@@ -36,19 +37,27 @@ class ContentModerationWorkflowTypeTest extends BrowserTestBase {
    * Test creating a new workflow using the content moderation plugin.
    */
   public function testNewWorkflow() {
+    $types[] = $this->createContentType();
+    $types[] = $this->createContentType();
+    $types[] = $this->createContentType();
+
     $entity_bundle_info = \Drupal::service('entity_type.bundle.info');
 
     $this->drupalPostForm('admin/config/workflow/workflows/add', [
-      'label' => 'Test Workflow',
-      'id' => 'test_workflow',
+      'label' => 'Test',
+      'id' => 'test',
       'workflow_type' => 'content_moderation',
     ], 'Save');
 
+    $session = $this->assertSession();
     // Make sure the test workflow includes the default states and transitions.
-    $this->assertSession()->pageTextContains('Draft');
-    $this->assertSession()->pageTextContains('Published');
-    $this->assertSession()->pageTextContains('Create New Draft');
-    $this->assertSession()->pageTextContains('Publish');
+    $session->pageTextContains('Draft');
+    $session->pageTextContains('Published');
+    $session->pageTextContains('Create New Draft');
+    $session->pageTextContains('Publish');
+
+    $session->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test/state/draft/delete');
+    $session->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test/state/published/delete');
 
     // Ensure after a workflow is created, the bundle information can be
     // refreshed.
@@ -59,20 +68,40 @@ class ContentModerationWorkflowTypeTest extends BrowserTestBase {
     $this->submitForm([
       'label' => 'Test State',
       'id' => 'test_state',
-      'type_settings[content_moderation][published]' => TRUE,
-      'type_settings[content_moderation][default_revision]' => FALSE,
+      'type_settings[published]' => TRUE,
+      'type_settings[default_revision]' => FALSE,
     ], 'Save');
-    $this->assertSession()->pageTextContains('Created Test State state.');
+    $session->pageTextContains('Created Test State state.');
+    $session->linkByHrefExists('/admin/config/workflow/workflows/manage/test/state/test_state/delete');
+
+    // Check there is a link to delete a default transition.
+    $session->linkByHrefExists('/admin/config/workflow/workflows/manage/test/transition/publish/delete');
+    // Delete the transition.
+    $this->drupalGet('/admin/config/workflow/workflows/manage/test/transition/publish/delete');
+    $this->submitForm([], 'Delete');
+    // The link to delete the transition should now be gone.
+    $session->linkByHrefNotExists('/admin/config/workflow/workflows/manage/test/transition/publish/delete');
 
     // Ensure that the published settings cannot be changed.
-    $this->drupalGet('admin/config/workflow/workflows/manage/test_workflow/state/published');
-    $this->assertSession()->fieldDisabled('type_settings[content_moderation][published]');
-    $this->assertSession()->fieldDisabled('type_settings[content_moderation][default_revision]');
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/state/published');
+    $session->fieldDisabled('type_settings[published]');
+    $session->fieldDisabled('type_settings[default_revision]');
 
     // Ensure that the draft settings cannot be changed.
-    $this->drupalGet('admin/config/workflow/workflows/manage/test_workflow/state/draft');
-    $this->assertSession()->fieldDisabled('type_settings[content_moderation][published]');
-    $this->assertSession()->fieldDisabled('type_settings[content_moderation][default_revision]');
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/state/draft');
+    $session->fieldDisabled('type_settings[published]');
+    $session->fieldDisabled('type_settings[default_revision]');
+
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/type/node');
+    $session->pageTextContains('Select the content types for the Test workflow');
+    foreach ($types as $type) {
+      $session->pageTextContains($type->label());
+      $session->elementContains('css', sprintf('.form-item-bundles-%s label', $type->id()), sprintf('Update %s', $type->label()));
+    }
+
+    // Ensure warning message are displayed for unsupported features.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/type/entity_test_rev');
+    $this->assertSession()->pageTextContains('Test entity - revisions entities do not support publishing statuses. For example, even after transitioning from a published workflow state to an unpublished workflow state they will still be visible to site visitors.');
   }
 
 }

web/core/modules/content_moderation/tests/src/Functional/DefaultContentModerationStateRevisionUpdateTest.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
+
+/**
+ * Test updating the ContentModerationState entity default revisions.
+ *
+ * @group Update
+ * @group legacy
+ * @see content_moderation_post_update_update_cms_default_revisions
+ */
+class DefaultContentModerationStateRevisionUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.4.0.bare.standard.php.gz',
+      __DIR__ . '/../../fixtures/update/drupal-8.4.0-content_moderation_installed.php',
+    ];
+  }
+
+  /**
+   * Test updating the default revision.
+   */
+  public function testUpdateDefaultRevision() {
+    // Include the database fixture required to test updating the default
+    // revision. This is excluded from  ::setDatabaseDumpFiles so that we can
+    // test the same post_update hook with no test content enabled.
+    require __DIR__ . '/../../fixtures/update/drupal-8.default-cms-entity-id-2941736.php';
+
+    $this->runUpdates();
+
+    foreach (['node', 'block_content'] as $entity_type_id) {
+      $draft_pending_revision = $this->getEntityByLabel($entity_type_id, 'draft pending revision');
+      $this->assertFalse($draft_pending_revision->isLatestRevision());
+      $this->assertCompositeEntityMatchesDefaultRevisionId($draft_pending_revision);
+
+      $published_default_revision = $this->getEntityByLabel($entity_type_id, 'published default revision');
+      $this->assertTrue($published_default_revision->isLatestRevision());
+      $this->assertCompositeEntityMatchesDefaultRevisionId($published_default_revision);
+
+      $archived_default_revision = $this->getEntityByLabel($entity_type_id, 'archived default revision');
+      $this->assertTrue($archived_default_revision->isLatestRevision());
+      $this->assertCompositeEntityMatchesDefaultRevisionId($archived_default_revision);
+    }
+  }
+
+  /**
+   * Test the post_update hook when no entity types are being moderated.
+   */
+  public function testNoEntitiesUnderModeration() {
+    // If any errors occur during the post_update hook, the test case will fail.
+    $this->runUpdates();
+  }
+
+  /**
+   * Assert for the given entity, the default revision ID matches.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity to use for the assertion.
+   */
+  protected function assertCompositeEntityMatchesDefaultRevisionId(ContentEntityInterface $entity) {
+    $entity_type_manager = $this->container->get('entity_type.manager');
+    $entity_list = $entity_type_manager->getStorage('content_moderation_state')
+      ->loadByProperties([
+        'content_entity_type_id' => $entity->getEntityTypeId(),
+        'content_entity_id' => $entity->id(),
+      ]);
+    $content_moderation_state_entity = array_shift($entity_list);
+    $this->assertEquals($entity->getLoadedRevisionId(), $content_moderation_state_entity->content_entity_revision_id->value);
+
+    // Check that the data table records were updated correctly.
+    /** @var \Drupal\Core\Database\Connection $database */
+    $database = $this->container->get('database');
+    $query = 'SELECT * FROM {content_moderation_state_field_data} WHERE id = :id';
+    $records = $database->query($query, [':id' => $content_moderation_state_entity->id()])
+      ->fetchAllAssoc('langcode');
+    foreach ($records as $langcode => $record) {
+      /** @var \Drupal\Core\Entity\ContentEntityInterface $translation */
+      $translation = $content_moderation_state_entity->getTranslation($langcode);
+      foreach ((array) $record as $field_name => $value) {
+        if ($translation->hasField($field_name)) {
+          $items = $translation->get($field_name)->getValue();
+          $this->assertEquals(current($items[0]), $value);
+        }
+      }
+    }
+  }
+
+  /**
+   * Load an entity by label.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID.
+   * @param string $label
+   *   The label of the entity to load.
+   *
+   * @return \Drupal\Core\Entity\ContentEntityInterface
+   *   The loaded entity.
+   */
+  protected function getEntityByLabel($entity_type_id, $label) {
+    $entity_type_manager = $this->container->get('entity_type.manager');
+    $label_field = $entity_type_manager->getDefinition($entity_type_id)->getKey('label');
+    $entity_list = $entity_type_manager->getStorage($entity_type_id)
+      ->loadByProperties([$label_field => $label]);
+    return array_shift($entity_list);
+  }
+
+}

web/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php

@@ -1,130 +0,0 @@
-<?php
-
-namespace Drupal\Tests\content_moderation\Functional;
-
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\workflows\Entity\Workflow;
-
-/**
- * Tests the "Latest Revision" views filter.
- *
- * @group content_moderation
- */
-class LatestRevisionViewsFilterTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'content_moderation_test_views',
-    'content_moderation',
-  ];
-
-  /**
-   * Tests view shows the correct node IDs.
-   */
-  public function testViewShowsCorrectNids() {
-    $this->createNodeType('Test', 'test');
-
-    $permissions = [
-      'access content',
-      'view all revisions',
-    ];
-    $editor1 = $this->drupalCreateUser($permissions);
-
-    $this->drupalLogin($editor1);
-
-    // Make a pre-moderation node.
-    /** @var Node $node_0 */
-    $node_0 = Node::create([
-      'type' => 'test',
-      'title' => 'Node 0 - Rev 1',
-      'uid' => $editor1->id(),
-    ]);
-    $node_0->save();
-
-    // Now enable moderation for subsequent nodes.
-    $workflow = Workflow::load('editorial');
-    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'test');
-    $workflow->save();
-
-    // Make a node that is only ever in Draft.
-    /** @var Node $node_1 */
-    $node_1 = Node::create([
-      'type' => 'test',
-      'title' => 'Node 1 - Rev 1',
-      'uid' => $editor1->id(),
-    ]);
-    $node_1->moderation_state->value = 'draft';
-    $node_1->save();
-
-    // Make a node that is in Draft, then Published.
-    /** @var Node $node_2 */
-    $node_2 = Node::create([
-      'type' => 'test',
-      'title' => 'Node 2 - Rev 1',
-      'uid' => $editor1->id(),
-    ]);
-    $node_2->moderation_state->value = 'draft';
-    $node_2->save();
-
-    $node_2->setTitle('Node 2 - Rev 2');
-    $node_2->moderation_state->value = 'published';
-    $node_2->save();
-
-    // Make a node that is in Draft, then Published, then Draft.
-    /** @var Node $node_3 */
-    $node_3 = Node::create([
-      'type' => 'test',
-      'title' => 'Node 3 - Rev 1',
-      'uid' => $editor1->id(),
-    ]);
-    $node_3->moderation_state->value = 'draft';
-    $node_3->save();
-
-    $node_3->setTitle('Node 3 - Rev 2');
-    $node_3->moderation_state->value = 'published';
-    $node_3->save();
-
-    $node_3->setTitle('Node 3 - Rev 3');
-    $node_3->moderation_state->value = 'draft';
-    $node_3->save();
-
-    // Now show the View, and confirm that only the correct titles are showing.
-    $this->drupalGet('/latest');
-    $page = $this->getSession()->getPage();
-    $this->assertEquals(200, $this->getSession()->getStatusCode());
-    $this->assertTrue($page->hasContent('Node 1 - Rev 1'));
-    $this->assertTrue($page->hasContent('Node 2 - Rev 2'));
-    $this->assertTrue($page->hasContent('Node 3 - Rev 3'));
-    $this->assertFalse($page->hasContent('Node 2 - Rev 1'));
-    $this->assertFalse($page->hasContent('Node 3 - Rev 1'));
-    $this->assertFalse($page->hasContent('Node 3 - Rev 2'));
-    $this->assertFalse($page->hasContent('Node 0 - Rev 1'));
-  }
-
-  /**
-   * Creates a new node type.
-   *
-   * @param string $label
-   *   The human-readable label of the type to create.
-   * @param string $machine_name
-   *   The machine name of the type to create.
-   *
-   * @return NodeType
-   *   The node type just created.
-   */
-  protected function createNodeType($label, $machine_name) {
-    /** @var NodeType $node_type */
-    $node_type = NodeType::create([
-      'type' => $machine_name,
-      'label' => $label,
-    ]);
-    $node_type->save();
-
-    return $node_type;
-  }
-
-}

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

@@ -0,0 +1,131 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+
+/**
+ * Tests moderated content administration page functionality.
+ *
+ * @group content_moderation
+ */
+class ModeratedContentViewTest extends BrowserTestBase {
+
+  use ContentModerationTestTrait;
+
+  /**
+   * 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 = $this->createEditorialWorkflow();
+    $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');
+  }
+
+}

web/core/modules/content_moderation/tests/src/Functional/ModerationActionsTest.php

@@ -5,7 +5,7 @@ namespace Drupal\Tests\content_moderation\Functional;
 use Drupal\node\Entity\Node;
 use Drupal\simpletest\ContentTypeCreationTrait;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * Test the content moderation actions.
@@ -15,6 +15,7 @@ use Drupal\workflows\Entity\Workflow;
 class ModerationActionsTest extends BrowserTestBase {
 
   use ContentTypeCreationTrait;
+  use ContentModerationTestTrait;
 
   /**
    * Modules to enable.
@@ -38,7 +39,7 @@ class ModerationActionsTest extends BrowserTestBase {
     $standard_bundle = $this->createContentType(['type' => 'standard_bundle']);
     $standard_bundle->save();
 
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'moderated_bundle');
     $workflow->save();
 

web/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php

@@ -2,7 +2,8 @@
 
 namespace Drupal\Tests\content_moderation\Functional;
 
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Url;
 
 /**
  * Tests the moderation form, specifically on nodes.
@@ -11,6 +12,18 @@ use Drupal\workflows\Entity\Workflow;
  */
 class ModerationFormTest extends ModerationStateTestBase {
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'node',
+    'content_moderation',
+    'locale',
+    'content_translation',
+  ];
+
   /**
    * {@inheritdoc}
    */
@@ -24,9 +37,7 @@ class ModerationFormTest extends ModerationStateTestBase {
   /**
    * Tests the moderation form that shows on the latest version page.
    *
-   * The latest version page only shows if there is a forward revision. There
-   * is only a forward revision if a draft revision is created on a node where
-   * the default revision is not a published moderation state.
+   * The latest version page only shows if there is a pending revision.
    *
    * @see \Drupal\content_moderation\EntityOperations
    * @see \Drupal\Tests\content_moderation\Functional\ModerationStateBlockTest::testCustomBlockModeration
@@ -36,7 +47,8 @@ class ModerationFormTest extends ModerationStateTestBase {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'Some moderated content',
       'body[0][value]' => 'First version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     $node = $this->drupalGetNodeByTitle('Some moderated content');
     $canonical_path = sprintf('node/%d', $node->id());
@@ -51,7 +63,7 @@ class ModerationFormTest extends ModerationStateTestBase {
     $this->assertResponse(200);
     $this->assertField('edit-new-state', 'The node view page has a moderation form.');
 
-    // The latest version page should not show, because there is no forward
+    // The latest version page should not show, because there is no pending
     // revision.
     $this->drupalGet($latest_version_path);
     $this->assertResponse(403);
@@ -59,7 +71,8 @@ class ModerationFormTest extends ModerationStateTestBase {
     // Update the draft.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Second version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // The canonical view should have a moderation form, because it is not the
     // live revision.
@@ -67,15 +80,35 @@ class ModerationFormTest extends ModerationStateTestBase {
     $this->assertResponse(200);
     $this->assertField('edit-new-state', 'The node view page has a moderation form.');
 
+    // Preview the draft.
+    $this->drupalPostForm($edit_path, [
+      'body[0][value]' => 'Second version of the content.',
+      'moderation_state[0][state]' => 'draft',
+    ], t('Preview'));
+
+    // The preview view should not have a moderation form.
+    $preview_url = Url::fromRoute('entity.node.preview', [
+      'node_preview' => $node->uuid(),
+      'view_mode_id' => 'full',
+    ]);
+    $this->assertResponse(200);
+    $this->assertUrl($preview_url);
+    $this->assertNoField('edit-new-state', 'The node preview page has no moderation form.');
+
     // The latest version page should not show, because there is still no
-    // forward revision.
+    // pending revision.
     $this->drupalGet($latest_version_path);
     $this->assertResponse(403);
 
     // Publish the draft.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Third version of the content.',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
+
+    // Check widget default value.
+    $this->drupalGet($edit_path);
+    $this->assertFieldByName('moderation_state[0][state]', 'published', 'The moderation default value is set correctly.');
 
     // The published view should not have a moderation form, because it is the
     // live revision.
@@ -84,14 +117,15 @@ class ModerationFormTest extends ModerationStateTestBase {
     $this->assertNoField('edit-new-state', 'The node view page has no moderation form.');
 
     // The latest version page should not show, because there is still no
-    // forward revision.
+    // pending revision.
     $this->drupalGet($latest_version_path);
     $this->assertResponse(403);
 
-    // Make a forward revision.
+    // Make a pending revision.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Fourth version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // The published view should not have a moderation form, because it is the
     // live revision.
@@ -100,7 +134,7 @@ class ModerationFormTest extends ModerationStateTestBase {
     $this->assertNoField('edit-new-state', 'The node view page has no moderation form.');
 
     // The latest version page should show the moderation form and have "Draft"
-    // status, because the forward revision is in "Draft".
+    // status, because the pending revision is in "Draft".
     $this->drupalGet($latest_version_path);
     $this->assertResponse(200);
     $this->assertField('edit-new-state', 'The latest-version page has a moderation form.');
@@ -112,7 +146,7 @@ class ModerationFormTest extends ModerationStateTestBase {
     ], t('Apply'));
 
     // The latest version page should not show, because there is no
-    // forward revision.
+    // pending revision.
     $this->drupalGet($latest_version_path);
     $this->assertResponse(403);
   }
@@ -122,28 +156,27 @@ class ModerationFormTest extends ModerationStateTestBase {
    */
   public function testNonBundleModerationForm() {
     $this->drupalLogin($this->rootUser);
-    $workflow = Workflow::load('editorial');
-    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_mulrevpub', 'entity_test_mulrevpub');
-    $workflow->save();
+    $this->workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_mulrevpub', 'entity_test_mulrevpub');
+    $this->workflow->save();
 
     // Create new moderated content in draft.
-    $this->drupalPostForm('entity_test_mulrevpub/add', [], t('Save and Create New Draft'));
+    $this->drupalPostForm('entity_test_mulrevpub/add', ['moderation_state[0][state]' => 'draft'], t('Save'));
 
-    // The latest version page should not show, because there is no forward
+    // The latest version page should not show, because there is no pending
     // revision.
     $this->drupalGet('/entity_test_mulrevpub/manage/1/latest');
     $this->assertResponse(403);
 
     // Update the draft.
-    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Create New Draft'));
+    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save'));
 
     // The latest version page should not show, because there is still no
-    // forward revision.
+    // pending revision.
     $this->drupalGet('/entity_test_mulrevpub/manage/1/latest');
     $this->assertResponse(403);
 
     // Publish the draft.
-    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Publish'));
+    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'published'], t('Save'));
 
     // The published view should not have a moderation form, because it is the
     // default revision.
@@ -152,12 +185,12 @@ class ModerationFormTest extends ModerationStateTestBase {
     $this->assertNoText('Status', 'The node view page has no moderation form.');
 
     // The latest version page should not show, because there is still no
-    // forward revision.
+    // pending revision.
     $this->drupalGet('entity_test_mulrevpub/manage/1/latest');
     $this->assertResponse(403);
 
-    // Make a forward revision.
-    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Create New Draft'));
+    // Make a pending revision.
+    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save'));
 
     // The published view should not have a moderation form, because it is the
     // default revision.
@@ -166,10 +199,10 @@ class ModerationFormTest extends ModerationStateTestBase {
     $this->assertNoText('Status', 'The node view page has no moderation form.');
 
     // The latest version page should show the moderation form and have "Draft"
-    // status, because the forward revision is in "Draft".
+    // status, because the pending revision is in "Draft".
     $this->drupalGet('entity_test_mulrevpub/manage/1/latest');
     $this->assertResponse(200);
-    $this->assertText('Status', 'Form text found on the latest-version page.');
+    $this->assertText('Moderation state', 'Form text found on the latest-version page.');
     $this->assertText('Draft', 'Correct status found on the latest-version page.');
 
     // Submit the moderation form to change status to published.
@@ -178,7 +211,7 @@ class ModerationFormTest extends ModerationStateTestBase {
     ], t('Apply'));
 
     // The latest version page should not show, because there is no
-    // forward revision.
+    // pending revision.
     $this->drupalGet('entity_test_mulrevpub/manage/1/latest');
     $this->assertResponse(403);
   }
@@ -189,9 +222,10 @@ class ModerationFormTest extends ModerationStateTestBase {
   public function testModerationFormSetsRevisionAuthor() {
     // Create new moderated content in published.
     $node = $this->createNode(['type' => 'moderated_content', 'moderation_state' => 'published']);
-    // Make a forward revision.
+    // Make a pending revision.
     $node->title = $this->randomMachineName();
     $node->moderation_state->value = 'draft';
+    $node->setRevisionCreationTime(12345);
     $node->save();
 
     $another_user = $this->drupalCreateUser($this->permissions);
@@ -203,6 +237,287 @@ class ModerationFormTest extends ModerationStateTestBase {
 
     $this->drupalGet(sprintf('node/%d/revisions', $node->id()));
     $this->assertText('by ' . $another_user->getAccountName());
+
+    // Verify the revision creation time has been updated.
+    $node = $node->load($node->id());
+    $this->assertGreaterThan(12345, $node->getRevisionCreationTime());
+  }
+
+  /**
+   * Tests translated and moderated nodes.
+   */
+  public function testContentTranslationNodeForm() {
+    $this->drupalLogin($this->rootUser);
+
+    // Add French language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Enable content translation on articles.
+    $this->drupalGet('admin/config/regional/content-language');
+    $edit = [
+      'entity_types[node]' => TRUE,
+      'settings[node][moderated_content][translatable]' => TRUE,
+      'settings[node][moderated_content][settings][language][language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+
+    // Adding languages requires a container rebuild in the test running
+    // environment so that multilingual services are used.
+    $this->rebuildContainer();
+
+    // Create new moderated content in draft (revision 1).
+    $this->drupalPostForm('node/add/moderated_content', [
+      'title[0][value]' => 'Some moderated content',
+      'body[0][value]' => 'First version of the content.',
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
+    $this->assertTrue($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    $node = $this->drupalGetNodeByTitle('Some moderated content');
+    $this->assertTrue($node->language(), 'en');
+    $edit_path = sprintf('node/%d/edit', $node->id());
+    $translate_path = sprintf('node/%d/translations/add/en/fr', $node->id());
+    $latest_version_path = sprintf('node/%d/latest', $node->id());
+    $french = \Drupal::languageManager()->getLanguage('fr');
+
+    $this->drupalGet($latest_version_path);
+    $this->assertSession()->statusCodeEquals('403');
+    $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    // Add french translation (revision 2).
+    $this->drupalGet($translate_path);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'body[0][value]' => 'Second version of the content.',
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
+
+    $this->drupalGet($latest_version_path, ['language' => $french]);
+    $this->assertSession()->statusCodeEquals('403');
+    $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    // Add french pending revision (revision 3).
+    $this->drupalGet($edit_path, ['language' => $french]);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'body[0][value]' => 'Third version of the content.',
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
+
+    $this->drupalGet($latest_version_path, ['language' => $french]);
+    $this->assertTrue($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    $this->drupalGet($edit_path);
+    $this->clickLink('Delete');
+    $this->assertSession()->buttonExists('Delete');
+
+    $this->drupalGet($latest_version_path);
+    $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    // Publish the french pending revision (revision 4).
+    $this->drupalGet($edit_path, ['language' => $french]);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'body[0][value]' => 'Fifth version of the content.',
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
+
+    $this->drupalGet($latest_version_path, ['language' => $french]);
+    $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    // Publish the English pending revision (revision 5).
+    $this->drupalGet($edit_path);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'body[0][value]' => 'Sixth version of the content.',
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
+
+    $this->drupalGet($latest_version_path);
+    $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    // Make sure we are allowed to create a pending French revision.
+    $this->drupalGet($edit_path, ['language' => $french]);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+
+    // Add an English pending revision (revision 6).
+    $this->drupalGet($edit_path);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'body[0][value]' => 'Seventh version of the content.',
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
+
+    $this->drupalGet($latest_version_path);
+    $this->assertTrue($this->xpath('//ul[@class="entity-moderation-form"]'));
+    $this->drupalGet($latest_version_path, ['language' => $french]);
+    $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    // Publish the English pending revision (revision 7)
+    $this->drupalGet($edit_path);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'body[0][value]' => 'Eighth version of the content.',
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
+
+    $this->drupalGet($latest_version_path);
+    $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
+
+    // Make sure we are allowed to create a pending French revision.
+    $this->drupalGet($edit_path, ['language' => $french]);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+
+    // Make sure we are allowed to create a pending English revision.
+    $this->drupalGet($edit_path);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+
+    // Create new moderated content (revision 1).
+    $this->drupalPostForm('node/add/moderated_content', [
+      'title[0][value]' => 'Third moderated content',
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
+
+    $node = $this->drupalGetNodeByTitle('Third moderated content');
+    $this->assertTrue($node->language(), 'en');
+    $edit_path = sprintf('node/%d/edit', $node->id());
+    $translate_path = sprintf('node/%d/translations/add/en/fr', $node->id());
+
+    // Translate it, without updating data (revision 2).
+    $this->drupalGet($translate_path);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
+
+    // Add another draft for the translation (revision 3).
+    $this->drupalGet($edit_path, ['language' => $french]);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
+
+    // Updating and publishing the french translation is still possible.
+    $this->drupalGet($edit_path, ['language' => $french]);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
+
+    // Now the french translation is published, an english draft can be added.
+    $this->drupalGet($edit_path);
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
+  }
+
+  /**
+   * Test the moderation_state field when an alternative widget is set.
+   */
+  public function testAlternativeModerationStateWidget() {
+    $entity_form_display = EntityFormDisplay::load('node.moderated_content.default');
+    $entity_form_display->setComponent('moderation_state', [
+      'type' => 'string_textfield',
+      'region' => 'content',
+    ]);
+    $entity_form_display->save();
+    $this->drupalPostForm('node/add/moderated_content', [
+      'title[0][value]' => 'Test content',
+      'moderation_state[0][value]' => 'published',
+    ], 'Save');
+    $this->assertSession()->pageTextContains('Moderated content Test content has been created.');
+  }
+
+  /**
+   * Tests that workflows and states can not be deleted if they are in use.
+   *
+   * @covers \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration::workflowHasData
+   * @covers \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration::workflowStateHasData
+   */
+  public function testWorkflowInUse() {
+    $user = $this->createUser([
+      'administer workflows',
+      'create moderated_content content',
+      'edit own moderated_content content',
+      'use editorial transition create_new_draft',
+      'use editorial transition publish',
+      'use editorial transition archive',
+    ]);
+    $this->drupalLogin($user);
+    $paths = [
+      'archived_state' => 'admin/config/workflow/workflows/manage/editorial/state/archived/delete',
+      'editorial_workflow' => 'admin/config/workflow/workflows/manage/editorial/delete',
+    ];
+    $messages = [
+      'archived_state' => 'This workflow state is in use. You cannot remove this workflow state until you have removed all content using it.',
+      'editorial_workflow' => 'This workflow is in use. You cannot remove this workflow until you have removed all content using it.',
+    ];
+    foreach ($paths as $path) {
+      $this->drupalGet($path);
+      $this->assertSession()->buttonExists('Delete');
+    }
+    // Create new moderated content in draft.
+    $this->drupalPostForm('node/add/moderated_content', [
+      'title[0][value]' => 'Some moderated content',
+      'body[0][value]' => 'First version of the content.',
+      'moderation_state[0][state]' => 'draft',
+    ], 'Save');
+
+    // The archived state is not used yet, so can still be deleted.
+    $this->drupalGet($paths['archived_state']);
+    $this->assertSession()->buttonExists('Delete');
+
+    // The workflow is being used, so can't be deleted.
+    $this->drupalGet($paths['editorial_workflow']);
+    $this->assertSession()->buttonNotExists('Delete');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextContains($messages['editorial_workflow']);
+
+    $node = $this->drupalGetNodeByTitle('Some moderated content');
+    $this->drupalPostForm('node/' . $node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], 'Save');
+    $this->drupalPostForm('node/' . $node->id() . '/edit', [
+      'moderation_state[0][state]' => 'archived',
+    ], 'Save');
+
+    // Now the archived state is being used so it can not be deleted either.
+    foreach ($paths as $type => $path) {
+      $this->drupalGet($path);
+      $this->assertSession()->buttonNotExists('Delete');
+      $this->assertSession()->statusCodeEquals(200);
+      $this->assertSession()->pageTextContains($messages[$type]);
+    }
   }
 
 }

web/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php

@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\content_moderation\Functional;
 
+use Drupal\node\NodeInterface;
+
 /**
  * Test content_moderation functionality with localization and translation.
  *
@@ -22,19 +24,23 @@ class ModerationLocaleTest extends ModerationStateTestBase {
   ];
 
   /**
-   * Tests article translations can be moderated separately.
+   * {@inheritdoc}
    */
-  public function testTranslateModeratedContent() {
+  protected function setUp() {
+    parent::setUp();
+
     $this->drupalLogin($this->rootUser);
 
     // Enable moderation on Article node type.
     $this->createContentTypeFromUi('Article', 'article', TRUE);
 
-    // Add French language.
-    $edit = [
-      'predefined_langcode' => 'fr',
-    ];
-    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+    // Add French and Italian languages.
+    foreach (['fr', 'it'] as $langcode) {
+      $edit = [
+        'predefined_langcode' => $langcode,
+      ];
+      $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+    }
 
     // Enable content translation on articles.
     $this->drupalGet('admin/config/regional/content-language');
@@ -48,13 +54,19 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     // Adding languages requires a container rebuild in the test running
     // environment so that multilingual services are used.
     $this->rebuildContainer();
+  }
 
+  /**
+   * Tests article translations can be moderated separately.
+   */
+  public function testTranslateModeratedContent() {
     // Create a published article in English.
     $edit = [
       'title[0][value]' => 'Published English node',
       'langcode[0][value]' => 'en',
+      'moderation_state[0][state]' => 'published',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and Publish'));
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertText(t('Article Published English node has been created.'));
     $english_node = $this->drupalGetNodeByTitle('Published English node');
 
@@ -63,8 +75,9 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->clickLink(t('Add'));
     $edit = [
       'title[0][value]' => 'French node Draft',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
     // Here the error has occurred "The website encountered an unexpected error.
     // Please try again later."
     // If the translation has got lost.
@@ -74,8 +87,9 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $edit = [
       'title[0][value]' => 'English node',
       'langcode[0][value]' => 'en',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertText(t('Article English node has been created.'));
     $english_node = $this->drupalGetNodeByTitle('English node');
 
@@ -84,14 +98,17 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->clickLink(t('Add'));
     $edit = [
       'title[0][value]' => 'French node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
     $this->assertText(t('Article French node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('English node', TRUE);
 
     // Publish the English article and check that the translation stays
     // unpublished.
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
+    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article English node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('English node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -106,8 +123,9 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     // the translation first.
     $edit = [
       'title[0][value]' => 'Another node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertText(t('Article Another node has been created.'));
     $english_node = $this->drupalGetNodeByTitle('Another node');
 
@@ -116,14 +134,17 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->clickLink(t('Add'));
     $edit = [
       'title[0][value]' => 'Translated node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
     $this->assertText(t('Article Translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
 
     // Publish the translation and check that the source language version stays
     // unpublished.
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article Translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -135,8 +156,9 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     // Now check that we can create a new draft of the translation.
     $edit = [
       'title[0][value]' => 'New draft of translated node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save (this translation)'));
     $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -144,12 +166,11 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->assertTrue($french_node->isPublished());
     $this->assertEqual($french_node->getTitle(), 'Translated node', 'The default revision of the published translation remains the same.');
 
-    // Publish the draft.
-    $edit = [
-      'new_state' => 'published',
-    ];
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/latest', $edit, t('Apply'));
-    $this->assertText(t('The moderation state has been updated.'));
+    // Publish the French article before testing the archive transition.
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
+    $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
     $this->assertEqual($french_node->moderation_state->value, 'published');
@@ -157,15 +178,21 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->assertEqual($french_node->getTitle(), 'New draft of translated node', 'The draft has replaced the published revision.');
 
     // Publish the English article before testing the archive transition.
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
+    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article Another node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $this->assertEqual($english_node->moderation_state->value, 'published');
 
     // Archive the node and its translation.
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)'));
+    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'archived',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article Another node has been updated.'));
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)'));
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'archived',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -173,43 +200,363 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->assertFalse($english_node->isPublished());
     $this->assertEqual($french_node->moderation_state->value, 'archived');
     $this->assertFalse($french_node->isPublished());
+  }
 
-    // Create another article with its translation. This time publishing english
-    // after creating a forward french revision.
-    $edit = [
-      'title[0][value]' => 'An english node',
-    ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft'));
-    $this->assertText(t('Article An english node has been created.'));
-    $english_node = $this->drupalGetNodeByTitle('An english node');
-    $this->assertFalse($english_node->isPublished());
+  /**
+   * Tests that individual translations can be moderated independently.
+   */
+  public function testLanguageIndependentContentModeration() {
+    // Create a published article in English (revision 1).
+    $this->drupalGet('node/add/article');
+    $node = $this->submitNodeForm('Test 1.1 EN', 'published');
+    $this->assertNotLatestVersionPage($node);
 
-    // Add a French translation.
-    $this->drupalGet('node/' . $english_node->id() . '/translations');
+    $edit_path = $node->toUrl('edit-form');
+    $translate_path = $node->toUrl('drupal:content-translation-overview');
+
+    // Create a new English draft (revision 2).
+    $this->drupalGet($edit_path);
+    $this->submitNodeForm('Test 1.2 EN', 'draft', TRUE);
+    $this->assertLatestVersionPage($node);
+
+    // Add a French translation draft (revision 3).
+    $this->drupalGet($translate_path);
     $this->clickLink(t('Add'));
+    $this->submitNodeForm('Test 1.3 FR', 'draft');
+    $fr_node = $this->loadTranslation($node, 'fr');
+    $this->assertLatestVersionPage($fr_node);
+    $this->assertModerationForm($node);
+
+    // Add an Italian translation draft (revision 4).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Add'));
+    $this->submitNodeForm('Test 1.4 IT', 'draft');
+    $it_node = $this->loadTranslation($node, 'it');
+    $this->assertLatestVersionPage($it_node);
+    $this->assertModerationForm($node);
+    $this->assertModerationForm($fr_node);
+
+    // Publish the English draft (revision 5).
+    $this->drupalGet($edit_path);
+    $this->submitNodeForm('Test 1.5 EN', 'published', TRUE);
+    $this->assertNotLatestVersionPage($node);
+    $this->assertModerationForm($fr_node);
+    $this->assertModerationForm($it_node);
+
+    // Publish the Italian draft (revision 6).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 2);
+    $this->submitNodeForm('Test 1.6 IT', 'published');
+    $this->assertNotLatestVersionPage($it_node);
+    $this->assertNoModerationForm($node);
+    $this->assertModerationForm($fr_node);
+
+    // Publish the French draft (revision 7).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 1);
+    $this->submitNodeForm('Test 1.7 FR', 'published');
+    $this->assertNotLatestVersionPage($fr_node);
+    $this->assertNoModerationForm($node);
+    $this->assertNoModerationForm($it_node);
+
+    // Create an Italian draft (revision 8).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 2);
+    $this->submitNodeForm('Test 1.8 IT', 'draft');
+    $this->assertLatestVersionPage($it_node);
+    $this->assertNoModerationForm($node);
+    $this->assertNoModerationForm($fr_node);
+
+    // Create a French draft (revision 9).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 1);
+    $this->submitNodeForm('Test 1.9 FR', 'draft');
+    $this->assertLatestVersionPage($fr_node);
+    $this->assertNoModerationForm($node);
+    $this->assertModerationForm($it_node);
+
+    // Create an English draft (revision 10).
+    $this->drupalGet($edit_path);
+    $this->submitNodeForm('Test 1.10 EN', 'draft');
+    $this->assertLatestVersionPage($node);
+    $this->assertModerationForm($fr_node);
+    $this->assertModerationForm($it_node);
+
+    // Now start from a draft article in English (revision 1).
+    $this->drupalGet('node/add/article');
+    $node2 = $this->submitNodeForm('Test 2.1 EN', 'draft', TRUE);
+    $this->assertNotLatestVersionPage($node2, TRUE);
+
+    $edit_path = $node2->toUrl('edit-form');
+    $translate_path = $node2->toUrl('drupal:content-translation-overview');
+
+    // Add a French translation (revision 2).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Add'));
+    $this->submitNodeForm('Test 2.2 FR', 'draft');
+    $fr_node2 = $this->loadTranslation($node2, 'fr');
+    $this->assertNotLatestVersionPage($fr_node2, TRUE);
+    $this->assertModerationForm($node2, FALSE);
+
+    // Add an Italian translation (revision 3).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Add'));
+    $this->submitNodeForm('Test 2.3 IT', 'draft');
+    $it_node2 = $this->loadTranslation($node2, 'it');
+    $this->assertNotLatestVersionPage($it_node2, TRUE);
+    $this->assertModerationForm($node2, FALSE);
+    $this->assertModerationForm($fr_node2, FALSE);
+
+    // Publish the English draft (revision 4).
+    $this->drupalGet($edit_path);
+    $this->submitNodeForm('Test 2.4 EN', 'published', TRUE);
+    $this->assertNotLatestVersionPage($node2);
+    $this->assertModerationForm($fr_node2, FALSE);
+    $this->assertModerationForm($it_node2, FALSE);
+
+    // Publish the Italian draft (revision 5).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 2);
+    $this->submitNodeForm('Test 2.5 IT', 'published');
+    $this->assertNotLatestVersionPage($it_node2);
+    $this->assertNoModerationForm($node2);
+    $this->assertModerationForm($fr_node2, FALSE);
+
+    // Publish the French draft (revision 6).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 1);
+    $this->submitNodeForm('Test 2.6 FR', 'published');
+    $this->assertNotLatestVersionPage($fr_node2);
+    $this->assertNoModerationForm($node2);
+    $this->assertNoModerationForm($it_node2);
+
+    // Now that all revision translations are published, verify that the
+    // moderation form is never displayed on revision pages.
+    /** @var \Drupal\node\NodeStorageInterface $storage */
+    $storage = $this->container->get('entity_type.manager')->getStorage('node');
+    foreach (range(11, 16) as $revision_id) {
+      /** @var \Drupal\node\NodeInterface $revision */
+      $revision = $storage->loadRevision($revision_id);
+      foreach ($revision->getTranslationLanguages() as $langcode => $language) {
+        if ($revision->isRevisionTranslationAffected()) {
+          $this->drupalGet($revision->toUrl('revision'));
+          $this->assertFalse($this->hasModerationForm(), 'Moderation form is not displayed correctly for revision ' . $revision_id);
+          break;
+        }
+      }
+    }
+
+    // Create an Italian draft (revision 7).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 2);
+    $this->submitNodeForm('Test 2.7 IT', 'draft');
+    $this->assertLatestVersionPage($it_node2);
+    $this->assertNoModerationForm($node2);
+    $this->assertNoModerationForm($fr_node2);
+
+    // Create a French draft (revision 8).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 1);
+    $this->submitNodeForm('Test 2.8 FR', 'draft');
+    $this->assertLatestVersionPage($fr_node2);
+    $this->assertNoModerationForm($node2);
+    $this->assertModerationForm($it_node2);
+
+    // Create an English draft (revision 9).
+    $this->drupalGet($edit_path);
+    $this->submitNodeForm('Test 2.9 EN', 'draft', TRUE);
+    $this->assertLatestVersionPage($node2);
+    $this->assertModerationForm($fr_node2);
+    $this->assertModerationForm($it_node2);
+
+    // Now publish a draft in another language first and verify that the
+    // moderation form is not displayed on the English node view page.
+    $this->drupalGet('node/add/article');
+    $node3 = $this->submitNodeForm('Test 3.1 EN', 'published');
+    $this->assertNotLatestVersionPage($node3);
+
+    $edit_path = $node3->toUrl('edit-form');
+    $translate_path = $node3->toUrl('drupal:content-translation-overview');
+
+    // Create an English draft (revision 2).
+    $this->drupalGet($edit_path);
+    $this->submitNodeForm('Test 3.2 EN', 'draft', TRUE);
+    $this->assertLatestVersionPage($node3);
+
+    // Add a French translation (revision 3).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Add'));
+    $this->submitNodeForm('Test 3.3 FR', 'draft');
+    $fr_node3 = $this->loadTranslation($node3, 'fr');
+    $this->assertLatestVersionPage($fr_node3);
+    $this->assertModerationForm($node3);
+
+    // Publish the French draft (revision 4).
+    $this->drupalGet($translate_path);
+    $this->clickLink(t('Edit'), 1);
+    $this->submitNodeForm('Test 3.4 FR', 'published');
+    $this->assertNotLatestVersionPage($fr_node3);
+    $this->assertModerationForm($node3);
+  }
+
+  /**
+   * Checks that new translation values are populated properly.
+   */
+  public function testNewTranslationSourceValues() {
+    // Create a published article in Italian (revision 1).
+    $this->drupalGet('node/add/article');
+    $node = $this->submitNodeForm('Test 1.1 IT', 'published', TRUE, 'it');
+    $this->assertNotLatestVersionPage($node);
+
+    // Create a new draft (revision 2).
+    $this->drupalGet($node->toUrl('edit-form'));
+    $this->submitNodeForm('Test 1.2 IT', 'draft', TRUE);
+    $this->assertLatestVersionPage($node);
+
+    // Create an English draft (revision 3) and verify that the Italian draft
+    // values are used as source values.
+    $url = $node->toUrl('drupal:content-translation-add');
+    $url->setRouteParameter('source', 'it');
+    $url->setRouteParameter('target', 'en');
+    $this->drupalGet($url);
+    $this->assertSession()->pageTextContains('Test 1.2 IT');
+    $this->submitNodeForm('Test 1.3 EN', 'draft');
+    $this->assertLatestVersionPage($node);
+
+    // Create a French draft (without saving) and verify that the Italian draft
+    // values are used as source values.
+    $url->setRouteParameter('target', 'fr');
+    $this->drupalGet($url);
+    $this->assertSession()->pageTextContains('Test 1.2 IT');
+
+    // Now switch source language and verify that the English draft values are
+    // used as source values.
+    $url->setRouteParameter('source', 'en');
+    $this->drupalGet($url);
+    $this->assertSession()->pageTextContains('Test 1.3 EN');
+  }
+
+  /**
+   * Submits the node form at the current URL with the specified values.
+   *
+   * @param string $title
+   *   The node title.
+   * @param string $moderation_state
+   *   The moderation state.
+   * @param bool $default_translation
+   *   (optional) Whether we are editing the default translation.
+   * @param string|null $langcode
+   *   (optional) The node language. Defaults to English.
+   *
+   * @return \Drupal\node\NodeInterface|null
+   *   A node object if a new one is being created, NULL otherwise.
+   */
+  protected function submitNodeForm($title, $moderation_state, $default_translation = FALSE, $langcode = 'en') {
+    $is_new = strpos($this->getSession()->getCurrentUrl(), '/node/add/') !== FALSE;
     $edit = [
-      'title[0][value]' => 'A french node',
+      'title[0][value]' => $title,
+      'moderation_state[0][state]' => $moderation_state,
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and Publish (this translation)'));
-    $english_node = $this->drupalGetNodeByTitle('An english node', TRUE);
-    $french_node = $english_node->getTranslation('fr');
-    $this->assertTrue($french_node->isPublished());
-    $this->assertFalse($english_node->isPublished());
+    if ($is_new) {
+      $default_translation = TRUE;
+      $edit['langcode[0][value]'] = $langcode;
+    }
+    $submit = $default_translation ? t('Save') : t('Save (this translation)');
+    $this->drupalPostForm(NULL, $edit, $submit);
+    $message = $is_new ? "Article $title has been created." : "Article $title has been updated.";
+    $this->assertSession()->pageTextContains($message);
+    return $is_new ? $this->drupalGetNodeByTitle($title) : NULL;
+  }
 
-    // Create a forward revision
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Create New Draft (this translation)'));
-    $english_node = $this->drupalGetNodeByTitle('An english node', TRUE);
-    $french_node = $english_node->getTranslation('fr');
-    $this->assertTrue($french_node->isPublished());
-    $this->assertFalse($english_node->isPublished());
+  /**
+   * Loads the node translation for the specified language.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   A node object.
+   * @param string $langcode
+   *   The translation language code.
+   *
+   * @return \Drupal\node\NodeInterface
+   *   The node translation object.
+   */
+  protected function loadTranslation(NodeInterface $node, $langcode) {
+    /** @var \Drupal\node\NodeStorageInterface $storage */
+    $storage = $this->container->get('entity_type.manager')->getStorage('node');
+    // Explicitly invalidate the cache for that node, as the call below is
+    // statically cached.
+    $storage->resetCache([$node->id()]);
+    /** @var \Drupal\node\NodeInterface $node */
+    $node = $storage->loadRevision($storage->getLatestRevisionId($node->id()));
+    return $node->getTranslation($langcode);
+  }
 
-    // Publish the english node and the default french node not the latest
-    // french node should be used.
-    $this->drupalPostForm('/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
-    $english_node = $this->drupalGetNodeByTitle('An english node', TRUE);
-    $french_node = $english_node->getTranslation('fr');
-    $this->assertTrue($french_node->isPublished());
-    $this->assertTrue($english_node->isPublished());
+  /**
+   * Asserts that this is the "latest version" page for the specified node.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   A node object.
+   */
+  public function assertLatestVersionPage(NodeInterface $node) {
+    $this->assertEquals($node->toUrl('latest-version')->setAbsolute()->toString(), $this->getSession()->getCurrentUrl());
+    $this->assertModerationForm($node);
+  }
+
+  /**
+   * Asserts that this is not the "latest version" page for the specified node.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   A node object.
+   * @param bool $moderation_form
+   *   (optional) Whether the page should contain the moderation form. Defaults
+   *   to FALSE.
+   */
+  public function assertNotLatestVersionPage(NodeInterface $node, $moderation_form = FALSE) {
+    $this->assertNotEquals($node->toUrl('latest-version')->setAbsolute()->toString(), $this->getSession()->getCurrentUrl());
+    if ($moderation_form) {
+      $this->assertModerationForm($node, FALSE);
+    }
+    else {
+      $this->assertNoModerationForm($node);
+    }
+  }
+
+  /**
+   * Asserts that the moderation form is displayed for the specified node.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   A node object.
+   * @param bool $latest_tab
+   *   (optional) Whether the node form is expected to be displayed on the
+   *   latest version page or on the node view page. Defaults to the former.
+   */
+  public function assertModerationForm(NodeInterface $node, $latest_tab = TRUE) {
+    $this->drupalGet($node->toUrl());
+    $this->assertEquals(!$latest_tab, $this->hasModerationForm());
+    $this->drupalGet($node->toUrl('latest-version'));
+    $this->assertEquals($latest_tab, $this->hasModerationForm());
+  }
+
+  /**
+   * Asserts that the moderation form is not displayed for the specified node.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   A node object.
+   */
+  public function assertNoModerationForm(NodeInterface $node) {
+    $this->drupalGet($node->toUrl());
+    $this->assertFalse($this->hasModerationForm());
+    $this->drupalGet($node->toUrl('latest-version'));
+    $this->assertEquals(403, $this->getSession()->getStatusCode());
+  }
+
+  /**
+   * Checks whether the page contains the moderation form.
+   *
+   * @return bool
+   *   TRUE if the moderation form could be find in the page, FALSE otherwise.
+   */
+  public function hasModerationForm() {
+    return (bool) $this->xpath('//ul[@class="entity-moderation-form"]');
   }
 
 }

web/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php

@@ -4,7 +4,7 @@ namespace Drupal\Tests\content_moderation\Functional;
 
 use Drupal\simpletest\ContentTypeCreationTrait;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * Test revision revert.
@@ -14,6 +14,7 @@ use Drupal\workflows\Entity\Workflow;
 class ModerationRevisionRevertTest extends BrowserTestBase {
 
   use ContentTypeCreationTrait;
+  use ContentModerationTestTrait;
 
   /**
    * Modules to enable.
@@ -34,16 +35,19 @@ class ModerationRevisionRevertTest extends BrowserTestBase {
     $moderated_bundle = $this->createContentType(['type' => 'moderated_bundle']);
     $moderated_bundle->save();
 
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'moderated_bundle');
     $workflow->save();
 
+    /** @var \Drupal\Core\Routing\RouteBuilderInterface $router_builder */
+    $router_builder = $this->container->get('router.builder');
+    $router_builder->rebuildIfNeeded();
+
     $admin = $this->drupalCreateUser([
       'access content overview',
       'administer nodes',
       'bypass node access',
       'view all revisions',
-      'view content moderation',
       'use editorial transition create_new_draft',
       'use editorial transition publish',
     ]);
@@ -55,10 +59,16 @@ class ModerationRevisionRevertTest extends BrowserTestBase {
    */
   public function testEditingAfterRevertRevision() {
     // Create a draft.
-    $this->drupalPostForm('node/add/moderated_bundle', ['title[0][value]' => 'First draft node'], t('Save and Create New Draft'));
+    $this->drupalPostForm('node/add/moderated_bundle', [
+      'title[0][value]' => 'First draft node',
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // Now make it published.
-    $this->drupalPostForm('node/1/edit', ['title[0][value]' => 'Published node'], t('Save and Publish'));
+    $this->drupalPostForm('node/1/edit', [
+      'title[0][value]' => 'Published node',
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     // Check the editing form that show the published title.
     $this->drupalGet('node/1/edit');
@@ -76,7 +86,9 @@ class ModerationRevisionRevertTest extends BrowserTestBase {
     $this->assertSession()
       ->pageTextContains('First draft node');
     // Try to save the node.
-    $this->click('.moderation-state-draft > input');
+    $this->drupalPostForm('node/1/edit', [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // Check if the submission passed the EntityChangedConstraintValidator.
     $this->assertSession()

web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php

@@ -5,7 +5,7 @@ namespace Drupal\Tests\content_moderation\Functional;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * Tests the view access control handler for moderation state entities.
@@ -14,6 +14,8 @@ use Drupal\workflows\Entity\Workflow;
  */
 class ModerationStateAccessTest extends BrowserTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -32,7 +34,6 @@ class ModerationStateAccessTest extends BrowserTestBase {
     $permissions = [
       'access content',
       'view all revisions',
-      'view content moderation',
     ];
     $editor1 = $this->drupalCreateUser($permissions);
     $this->drupalLogin($editor1);
@@ -69,7 +70,6 @@ class ModerationStateAccessTest extends BrowserTestBase {
     $permissions = [
       'access content',
       'view all revisions',
-      'administer content moderation',
     ];
     $admin1 = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin1);
@@ -90,18 +90,18 @@ class ModerationStateAccessTest extends BrowserTestBase {
    * @param string $machine_name
    *   The machine name of the type to create.
    *
-   * @return NodeType
+   * @return \Drupal\node\Entity\NodeType
    *   The node type just created.
    */
   protected function createNodeType($label, $machine_name) {
-    /** @var NodeType $node_type */
+    /** @var \Drupal\node\Entity\NodeType $node_type */
     $node_type = NodeType::create([
       'type' => $machine_name,
       'label' => $label,
     ]);
     $node_type->save();
 
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', $machine_name);
     $workflow->save();
     return $node_type;

web/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php

@@ -51,25 +51,18 @@ class ModerationStateBlockTest extends ModerationStateTestBase {
   public function testCustomBlockModeration() {
     $this->drupalLogin($this->rootUser);
 
-    $this->drupalGet('admin/structure/block/block-content/types');
-    $this->assertLinkByHref('admin/structure/block/block-content/manage/basic/moderation');
-    $this->drupalGet('admin/structure/block/block-content/manage/basic');
-    $this->assertLinkByHref('admin/structure/block/block-content/manage/basic/moderation');
-    $this->drupalGet('admin/structure/block/block-content/manage/basic/moderation');
-
-    // Enable moderation for custom blocks at
-    // admin/structure/block/block-content/manage/basic/moderation.
-    $edit = ['workflow' => 'editorial'];
-    $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText(t('Your settings have been saved.'));
+    // Enable moderation for custom blocks.
+    $edit['bundles[basic]'] = TRUE;
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/type/block_content', $edit, t('Save'));
 
     // Create a custom block at block/add and save it as draft.
     $body = 'Body of moderated block';
     $edit = [
       'info[0][value]' => 'Moderated block',
+      'moderation_state[0][state]' => 'draft',
       'body[0][value]' => $body,
     ];
-    $this->drupalPostForm('block/add', $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('block/add', $edit, t('Save'));
     $this->assertText(t('basic Moderated block has been created.'));
 
     // Place the block in the Sidebar First region.
@@ -91,8 +84,9 @@ class ModerationStateBlockTest extends ModerationStateTestBase {
     $updated_body = 'This is the new body value';
     $edit = [
       'body[0][value]' => $updated_body,
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save'));
     $this->assertText(t('basic Moderated block has been updated.'));
 
     // Navigate to the home page and check that the block shows the updated
@@ -101,18 +95,21 @@ class ModerationStateBlockTest extends ModerationStateTestBase {
     $this->drupalGet('');
     $this->assertText($updated_body);
 
-    // Publish the block so we can create a forward revision.
-    $this->drupalPostForm('block/' . $block->id(), [], t('Save and Publish'));
+    // Publish the block so we can create a pending revision.
+    $this->drupalPostForm('block/' . $block->id(), [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
-    // Create a forward revision.
-    $forward_revision_body = 'This is the forward revision body value';
+    // Create a pending revision.
+    $pending_revision_body = 'This is the pending revision body value';
     $edit = [
-      'body[0][value]' => $forward_revision_body,
+      'body[0][value]' => $pending_revision_body,
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save'));
     $this->assertText(t('basic Moderated block has been updated.'));
 
-    // Navigate to home page and check that the forward revision doesn't show,
+    // Navigate to home page and check that the pending revision doesn't show,
     // since it should not be set as the default revision.
     $this->drupalGet('');
     $this->assertText($updated_body);
@@ -124,10 +121,17 @@ class ModerationStateBlockTest extends ModerationStateTestBase {
     $this->drupalPostForm('block/' . $block->id() . '/latest', $edit, t('Apply'));
     $this->assertText(t('The moderation state has been updated.'));
 
-    // Navigate to home page and check that the forward revision is now the
+    // Navigate to home page and check that the pending revision is now the
     // default revision and therefore visible.
     $this->drupalGet('');
-    $this->assertText($forward_revision_body);
+    $this->assertText($pending_revision_body);
+
+    // Check that revision is checked by default when content moderation is
+    // enabled.
+    $this->drupalGet('/block/' . $block->id());
+    $this->assertSession()->checkboxChecked('revision');
+    $this->assertText('Revisions must be required when moderation is enabled.');
+    $this->assertSession()->fieldDisabled('revision');
   }
 
 }

web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php

@@ -28,7 +28,8 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
   public function testCreatingContent() {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'moderated content',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $node = $this->getNodeByTitle('moderated content');
     if (!$node) {
       $this->fail('Test node was not saved correctly.');
@@ -37,7 +38,9 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
 
     $path = 'node/' . $node->id() . '/edit';
     // Set up published revision.
-    $this->drupalPostForm($path, [], t('Save and Publish'));
+    $this->drupalPostForm($path, [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
     \Drupal::entityTypeManager()->getStorage('node')->resetCache([$node->id()]);
     /* @var \Drupal\node\NodeInterface $node */
     $node = \Drupal::entityTypeManager()->getStorage('node')->load($node->id());
@@ -52,9 +55,8 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     $this->assertText(t('The Moderated content moderated content has been deleted.'));
 
     // Disable content moderation.
-    $this->drupalPostForm('admin/structure/types/manage/moderated_content/moderation', ['workflow' => ''], t('Save'));
-    $this->drupalGet('admin/structure/types/manage/moderated_content/moderation');
-    $this->assertOptionSelected('edit-workflow', '');
+    $edit['bundles[moderated_content]'] = FALSE;
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/type/node', $edit, t('Save'));;
     // Ensure the parent environment is up-to-date.
     // @see content_moderation_workflow_insert()
     \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
@@ -63,7 +65,7 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     // Create a new node.
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'non-moderated content',
-    ], t('Save and publish'));
+    ], t('Save'));
 
     $node = $this->getNodeByTitle('non-moderated content');
     if (!$node) {
@@ -80,7 +82,8 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'Some moderated content',
       'body[0][value]' => 'First version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     $node = $this->drupalGetNodeByTitle('Some moderated content');
     $edit_path = sprintf('node/%d/edit', $node->id());
@@ -94,7 +97,8 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     // URL, but viewing the second revision.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Second version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()]));
     $this->assertText('Second version of the content.');
 
@@ -102,15 +106,17 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     // canonical URL.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Third version of the content.',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()]));
     $this->assertText('Third version of the content.');
 
-    // Make a new forward revision; after saving, we should be on the "Latest
+    // Make a new pending revision; after saving, we should be on the "Latest
     // version" tab.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Fourth version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.node.latest_version', ['node' => $node->id()]));
     $this->assertText('Fourth version of the content.');
   }
@@ -138,4 +144,29 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     $this->assertEqual(0, $query['page']);
   }
 
+  /**
+   * Tests the workflow when a user has no Content Moderation permissions.
+   */
+  public function testNoContentModerationPermissions() {
+    $session_assert = $this->assertSession();
+
+    // Create a user with quite advanced node permissions but no content
+    // moderation permissions.
+    $limited_user = $this->createUser([
+      'administer nodes',
+      'bypass node access',
+    ]);
+    $this->drupalLogin($limited_user);
+
+    // Check the user can see the content entity form, but can't see the
+    // moderation state select or save the entity form.
+    $this->drupalGet('node/add/moderated_content');
+    $session_assert->statusCodeEquals(200);
+    $session_assert->fieldNotExists('moderation_state[0][state]');
+    $this->drupalPostForm(NULL, [
+      'title[0][value]' => 'moderated content',
+    ], 'Save');
+    $session_assert->pageTextContains('You do not have access to transition from Draft to Draft');
+  }
+
 }

web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php

@@ -11,6 +11,9 @@ class ModerationStateNodeTypeTest extends ModerationStateTestBase {
 
   /**
    * A node type without moderation state disabled.
+   *
+   * @covers \Drupal\content_moderation\EntityTypeInfo::formAlter
+   * @covers \Drupal\content_moderation\Entity\Handler\NodeModerationHandler::enforceRevisionsBundleFormAlter
    */
   public function testNotModerated() {
     $this->drupalLogin($this->adminUser);
@@ -18,19 +21,22 @@ class ModerationStateNodeTypeTest extends ModerationStateTestBase {
     $this->assertText('The content type Not moderated has been added.');
     $this->grantUserPermissionToCreateContentOfType($this->adminUser, 'not_moderated');
     $this->drupalGet('node/add/not_moderated');
-    $this->assertRaw('Save as unpublished');
+    $this->assertRaw('Save');
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'Test',
-    ], t('Save and publish'));
+    ], t('Save'));
     $this->assertText('Not moderated Test has been created.');
   }
 
   /**
    * Tests enabling moderation on an existing node-type, with content.
+   *
+   * @covers \Drupal\content_moderation\EntityTypeInfo::formAlter
+   * @covers \Drupal\content_moderation\Entity\Handler\NodeModerationHandler::enforceRevisionsBundleFormAlter
    */
   public function testEnablingOnExistingContent() {
     $editor_permissions = [
-      'administer content moderation',
+      'administer workflows',
       'access administration pages',
       'administer content types',
       'administer nodes',
@@ -53,20 +59,11 @@ class ModerationStateNodeTypeTest extends ModerationStateTestBase {
     $this->drupalGet('node/add/not_moderated');
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'Test',
-    ], t('Save and publish'));
+    ], t('Save'));
     $this->assertText('Not moderated Test has been created.');
 
-    // Now enable moderation state, ensuring all the expected links and tabs are
-    // present.
-    $this->drupalGet('admin/structure/types');
-    $this->assertLinkByHref('admin/structure/types/manage/not_moderated/moderation');
-    $this->drupalGet('admin/structure/types/manage/not_moderated');
-    $this->assertLinkByHref('admin/structure/types/manage/not_moderated/moderation');
-    $this->drupalGet('admin/structure/types/manage/not_moderated/moderation');
-    $this->assertOptionSelected('edit-workflow', '');
-    $this->assertNoLink('Delete');
-    $edit['workflow'] = 'editorial';
-    $this->drupalPostForm(NULL, $edit, t('Save'));
+    // Now enable moderation state.
+    $this->enableModerationThroughUi('not_moderated');
 
     // And make sure it works.
     $nodes = \Drupal::entityTypeManager()->getStorage('node')
@@ -81,14 +78,14 @@ class ModerationStateNodeTypeTest extends ModerationStateTestBase {
     $this->assertLinkByHref('node/' . $node->id() . '/edit');
     $this->drupalGet('node/' . $node->id() . '/edit');
     $this->assertResponse(200);
-    $this->assertRaw('Save and Create New Draft');
-    $this->assertNoRaw('Save and Publish');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'published');
 
     $this->drupalLogin($editor_with_publish);
     $this->drupalGet('node/' . $node->id() . '/edit');
     $this->assertResponse(200);
-    $this->assertRaw('Save and Create New Draft');
-    $this->assertRaw('Save and Publish');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
   }
 
 }

web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php

@@ -3,7 +3,9 @@
 namespace Drupal\Tests\content_moderation\Functional;
 
 use Drupal\Core\Session\AccountInterface;
+use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 use Drupal\user\Entity\Role;
 
 /**
@@ -11,8 +13,12 @@ use Drupal\user\Entity\Role;
  */
 abstract class ModerationStateTestBase extends BrowserTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * Profile to use.
+   *
+   * @var string
    */
   protected $profile = 'testing';
 
@@ -29,7 +35,7 @@ abstract class ModerationStateTestBase extends BrowserTestBase {
    * @var array
    */
   protected $permissions = [
-    'administer content moderation',
+    'administer workflows',
     'access administration pages',
     'administer content types',
     'administer nodes',
@@ -38,8 +44,18 @@ abstract class ModerationStateTestBase extends BrowserTestBase {
     'access content overview',
     'use editorial transition create_new_draft',
     'use editorial transition publish',
+    'use editorial transition archive',
+    'use editorial transition archived_draft',
+    'use editorial transition archived_published',
   ];
 
+  /**
+   * The editorial workflow entity.
+   *
+   * @var \Drupal\workflows\Entity\Workflow
+   */
+  protected $workflow;
+
   /**
    * Modules to enable.
    *
@@ -58,6 +74,7 @@ abstract class ModerationStateTestBase extends BrowserTestBase {
    */
   protected function setUp() {
     parent::setUp();
+    $this->workflow = $this->createEditorialWorkflow();
     $this->adminUser = $this->drupalCreateUser($this->permissions);
     $this->drupalPlaceBlock('local_tasks_block', ['id' => 'tabs_block']);
     $this->drupalPlaceBlock('page_title_block');
@@ -94,12 +111,20 @@ abstract class ModerationStateTestBase extends BrowserTestBase {
   protected function createContentTypeFromUi($content_type_name, $content_type_id, $moderated = FALSE, $workflow_id = 'editorial') {
     $this->drupalGet('admin/structure/types');
     $this->clickLink('Add content type');
+
+    // Check that the 'Create new revision' checkbox is checked and disabled.
+    $this->assertSession()->checkboxChecked('options[revision]');
+    $this->assertSession()->fieldDisabled('options[revision]');
+
     $edit = [
       'name' => $content_type_name,
       'type' => $content_type_id,
     ];
     $this->drupalPostForm(NULL, $edit, t('Save content type'));
 
+    // Check the content type has been set to create new revisions.
+    $this->assertTrue(NodeType::load($content_type_id)->isNewRevision());
+
     if ($moderated) {
       $this->enableModerationThroughUi($content_type_id, $workflow_id);
     }
@@ -113,13 +138,18 @@ abstract class ModerationStateTestBase extends BrowserTestBase {
    * @param string $workflow_id
    *   The workflow to attach to the bundle.
    */
-  protected function enableModerationThroughUi($content_type_id, $workflow_id = 'editorial') {
-    $edit['workflow'] = $workflow_id;
-    $this->drupalPostForm('admin/structure/types/manage/' . $content_type_id . '/moderation', $edit, t('Save'));
+  public function enableModerationThroughUi($content_type_id, $workflow_id = 'editorial') {
+    $this->drupalGet('/admin/config/workflow/workflows');
+    $this->assertLinkByHref('admin/config/workflow/workflows/manage/' . $workflow_id);
+    $edit['bundles[' . $content_type_id . ']'] = TRUE;
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/' . $workflow_id . '/type/node', $edit, t('Save'));
     // Ensure the parent environment is up-to-date.
     // @see content_moderation_workflow_insert()
     \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
     \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
+    /** @var \Drupal\Core\Routing\RouteBuilderInterface $router_builder */
+    $router_builder = $this->container->get('router.builder');
+    $router_builder->rebuildIfNeeded();
   }
 
   /**

web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php

@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\content_moderation\Functional;
 
+use Drupal\node\Entity\NodeType;
+
 /**
  * Tests permission access control around nodes.
  *
@@ -19,7 +21,7 @@ class NodeAccessTest extends ModerationStateTestBase {
     'block',
     'block_content',
     'node',
-    'node_access_test_empty',
+    'node_access_test',
   ];
 
   /**
@@ -28,7 +30,7 @@ class NodeAccessTest extends ModerationStateTestBase {
    * @var array
    */
   protected $permissions = [
-    'administer content moderation',
+    'administer workflows',
     'access administration pages',
     'administer content types',
     'administer nodes',
@@ -46,9 +48,12 @@ class NodeAccessTest extends ModerationStateTestBase {
   protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);
-    $this->createContentTypeFromUi('Moderated content', 'moderated_content', TRUE);
+    $this->createContentTypeFromUi('Moderated content', 'moderated_content', FALSE);
     $this->grantUserPermissionToCreateContentOfType($this->adminUser, 'moderated_content');
 
+    // Add the private field to the node type.
+    node_access_test_add_field(NodeType::load('moderated_content'));
+
     // Rebuild permissions because hook_node_grants() is implemented by the
     // node_access_test_empty module.
     node_access_rebuild();
@@ -58,12 +63,29 @@ class NodeAccessTest extends ModerationStateTestBase {
    * Verifies that a non-admin user can still access the appropriate pages.
    */
   public function testPageAccess() {
+    // Initially disable access grant records in
+    // node_access_test_node_access_records().
+    \Drupal::state()->set('node_access_test.private', TRUE);
+
     $this->drupalLogin($this->adminUser);
 
+    // Access the node form before moderation is enabled, the publication state
+    // should now be visible.
+    $this->drupalGet('node/add/moderated_content');
+    $this->assertSession()->fieldExists('Published');
+
+    // Now enable the workflow.
+    $this->enableModerationThroughUi('moderated_content', 'editorial');
+
+    // Access that the status field is no longer visible.
+    $this->drupalGet('node/add/moderated_content');
+    $this->assertSession()->fieldNotExists('Published');
+
     // Create a node to test with.
-    $this->drupalPostForm('node/add/moderated_content', [
+    $this->drupalPostForm(NULL, [
       'title[0][value]' => 'moderated content',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $node = $this->getNodeByTitle('moderated content');
     if (!$node) {
       $this->fail('Test node was not saved correctly.');
@@ -91,7 +113,9 @@ class NodeAccessTest extends ModerationStateTestBase {
 
     // Publish the node.
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm($edit_path, [], t('Save and Publish'));
+    $this->drupalPostForm($edit_path, [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     // Ensure access works correctly for anonymous users.
     $this->drupalLogout();
@@ -104,11 +128,12 @@ class NodeAccessTest extends ModerationStateTestBase {
     $this->drupalGet($view_path);
     $this->assertResponse(200);
 
-    // Create a forward revision for the 'Latest revision' tab.
+    // Create a pending revision for the 'Latest revision' tab.
     $this->drupalLogin($this->adminUser);
     $this->drupalPostForm($edit_path, [
       'title[0][value]' => 'moderated content revised',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     $this->drupalLogin($user);
 
@@ -120,7 +145,7 @@ class NodeAccessTest extends ModerationStateTestBase {
     $this->drupalGet($view_path);
     $this->assertResponse(200);
 
-    // Now make another user, who should not be able to see forward revisions.
+    // Now make another user, who should not be able to see pending revisions.
     $user = $this->createUser([
       'use editorial transition create_new_draft',
     ]);
@@ -133,6 +158,30 @@ class NodeAccessTest extends ModerationStateTestBase {
     $this->assertResponse(403);
     $this->drupalGet($view_path);
     $this->assertResponse(200);
+
+    // Now create a private node that the user is not granted access to by the
+    // node grants, but is granted access via hook_node_access().
+    // @see node_access_test_node_access
+    $node = $this->createNode([
+      'type' => 'moderated_content',
+      'private' => TRUE,
+      'uid' => $this->adminUser->id(),
+    ]);
+    $user = $this->createUser([
+      'use editorial transition publish',
+    ]);
+    $this->drupalLogin($user);
+
+    // Grant access to the node via node_access_test_node_access().
+    \Drupal::state()->set('node_access_test.allow_uid', $user->id());
+
+    $this->drupalGet($node->toUrl());
+    $this->assertResponse(200);
+
+    // Verify the moderation form is in place by publishing the node.
+    $this->drupalPostForm(NULL, [], t('Apply'));
+    $node = \Drupal::entityTypeManager()->getStorage('node')->loadUnchanged($node->id());
+    $this->assertEquals('published', $node->moderation_state->value);
   }
 
 }

web/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php

@@ -0,0 +1,315 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
+use Drupal\views\ViewExecutable;
+use Drupal\views\Views;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Tests the views 'moderation_state_filter' filter plugin.
+ *
+ * @coversDefaultClass \Drupal\content_moderation\Plugin\views\filter\ModerationStateFilter
+ *
+ * @group content_moderation
+ */
+class ViewsModerationStateFilterTest extends ViewTestBase {
+
+  use ContentModerationTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'content_moderation_test_views',
+    'node',
+    'content_moderation',
+    'workflows',
+    'workflow_type_test',
+    'entity_test',
+    'language',
+    'content_translation',
+    'views_ui',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp(FALSE);
+
+    NodeType::create([
+      'type' => 'example_a',
+    ])->save();
+    NodeType::create([
+      'type' => 'example_b',
+    ])->save();
+
+    $this->createEditorialWorkflow();
+
+    $new_workflow = Workflow::create([
+      'type' => 'content_moderation',
+      'id' => 'new_workflow',
+      'label' => 'New workflow',
+    ]);
+    $new_workflow->getTypePlugin()->addState('bar', 'Bar');
+    $new_workflow->save();
+
+    $this->drupalLogin($this->drupalCreateUser(['administer workflows', 'administer views']));
+  }
+
+  /**
+   * Tests the dependency handling of the moderation state filter.
+   *
+   * @covers ::calculateDependencies
+   * @covers ::onDependencyRemoval
+   */
+  public function testModerationStateFilterDependencyHandling() {
+    // First, check that the view doesn't have any config dependency when there
+    // are no states configured in the filter.
+    $view_id = 'test_content_moderation_state_filter_base_table';
+    $view = Views::getView($view_id);
+
+    $this->assertWorkflowDependencies([], $view);
+    $this->assertTrue($view->storage->status());
+
+    // Configure the Editorial workflow for a node bundle, set the filter value
+    // to use one of its states and check that the workflow is now a dependency
+    // of the view.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/type/node', [
+      'bundles[example_a]' => TRUE,
+    ], 'Save');
+
+    $edit['options[value][]'] = ['editorial-published'];
+    $this->drupalPostForm("admin/structure/views/nojs/handler/$view_id/default/filter/moderation_state", $edit, 'Apply');
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+
+    $view = Views::getView($view_id);
+    $this->assertWorkflowDependencies(['editorial'], $view);
+    $this->assertTrue($view->storage->status());
+
+    // Create another workflow and repeat the checks above.
+    $this->drupalPostForm('admin/config/workflow/workflows/add', [
+      'label' => 'Translation',
+      'id' => 'translation',
+      'workflow_type' => 'content_moderation',
+    ], 'Save');
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/translation/add_state', [
+      'label' => 'Needs Review',
+      'id' => 'needs_review',
+    ], 'Save');
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/translation/type/node', [
+      'bundles[example_b]' => TRUE,
+    ], 'Save');
+
+    $edit['options[value][]'] = ['editorial-published', 'translation-needs_review'];
+    $this->drupalPostForm("admin/structure/views/nojs/handler/$view_id/default/filter/moderation_state", $edit, 'Apply');
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+
+    $view = Views::getView($view_id);
+    $this->assertWorkflowDependencies(['editorial', 'translation'], $view);
+    $this->assertTrue(isset($view->storage->getDisplay('default')['display_options']['filters']['moderation_state']));
+    $this->assertTrue($view->storage->status());
+
+    // Remove the 'Translation' workflow.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/translation/delete', [], 'Delete');
+
+    // Check that the view has been disabled, the filter has been deleted, the
+    // view can be saved and there are no more config dependencies.
+    $view = Views::getView($view_id);
+    $this->assertFalse($view->storage->status());
+    $this->assertFalse(isset($view->storage->getDisplay('default')['display_options']['filters']['moderation_state']));
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+    $this->assertWorkflowDependencies([], $view);
+  }
+
+  /**
+   * Tests the moderation state filter when the configured workflow is changed.
+   *
+   * @dataProvider providerTestWorkflowChanges
+   */
+  public function testWorkflowChanges($view_id, $filter_name) {
+    // Update the view and make the default filter not exposed anymore,
+    // otherwise all results will be shown when there are no more moderated
+    // bundles left.
+    $this->drupalPostForm("admin/structure/views/nojs/handler/$view_id/default/filter/moderation_state", [], 'Hide filter');
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+
+    // First, apply the Editorial workflow to both of our content types.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/type/node', [
+      'bundles[example_a]' => TRUE,
+      'bundles[example_b]' => TRUE,
+    ], 'Save');
+    \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+
+    // Add a few nodes in various moderation states.
+    $this->createNode(['type' => 'example_a', 'moderation_state' => 'published']);
+    $this->createNode(['type' => 'example_b', 'moderation_state' => 'published']);
+    $archived_node_a = $this->createNode(['type' => 'example_a', 'moderation_state' => 'archived']);
+    $archived_node_b = $this->createNode(['type' => 'example_b', 'moderation_state' => 'archived']);
+
+    // Configure the view to only show nodes in the 'archived' moderation state.
+    $edit['options[value][]'] = ['editorial-archived'];
+    $this->drupalPostForm("admin/structure/views/nojs/handler/$view_id/default/filter/moderation_state", $edit, 'Apply');
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+
+    // Check that only the archived nodes from both bundles are displayed by the
+    // view.
+    $view = Views::getView($view_id);
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, [['nid' => $archived_node_a->id()], ['nid' => $archived_node_b->id()]], ['nid' => 'nid']);
+
+    // Remove the Editorial workflow from one of the bundles.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/type/node', [
+      'bundles[example_a]' => TRUE,
+      'bundles[example_b]' => FALSE,
+    ], 'Save');
+    \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+
+    $view = Views::getView($view_id);
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, [['nid' => $archived_node_a->id()]], ['nid' => 'nid']);
+
+    // Check that the view can still be edited and saved without any
+    // intervention.
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+
+    // Remove the Editorial workflow from both bundles.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/type/node', [
+      'bundles[example_a]' => FALSE,
+      'bundles[example_b]' => FALSE,
+    ], 'Save');
+    \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+
+    $view = Views::getView($view_id);
+    $this->executeView($view);
+
+    // Check that the view doesn't return any result.
+    $this->assertEmpty($view->result);
+
+    // Check that the view can not be edited without any intervention anymore
+    // because the user needs to fix the filter.
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+    $this->assertSession()->pageTextContains("No valid values found on filter: $filter_name.");
+  }
+
+  /**
+   * Data provider for testWorkflowChanges.
+   *
+   * @return string[]
+   *   An array of view IDs.
+   */
+  public function providerTestWorkflowChanges() {
+    return [
+      'view on base table, filter on base table' => [
+        'test_content_moderation_state_filter_base_table',
+        'Content: Moderation state',
+      ],
+      'view on base table, filter on revision table' => [
+        'test_content_moderation_state_filter_base_table_filter_on_revision',
+        'Content revision: Moderation state',
+      ],
+    ];
+  }
+
+  /**
+   * Tests the content moderation state filter caching is correct.
+   */
+  public function testFilterRenderCache() {
+    // Initially all states of the workflow are displayed.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/type/node', [
+      'bundles[example_a]' => TRUE,
+    ], 'Save');
+    $this->assertFilterStates(['All', 'editorial-draft', 'editorial-published', 'editorial-archived']);
+
+    // Adding a new state to the editorial workflow will display that state in
+    // the list of filters.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/add_state', [
+      'label' => 'Foo',
+      'id' => 'foo',
+    ], 'Save');
+    $this->assertFilterStates(['All', 'editorial-draft', 'editorial-published', 'editorial-archived', 'editorial-foo']);
+
+    // Adding a second workflow to nodes will also show new states.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/new_workflow/type/node', [
+      'bundles[example_b]' => TRUE,
+    ], 'Save');
+    $this->assertFilterStates(['All', 'editorial-draft', 'editorial-published', 'editorial-archived', 'editorial-foo', 'new_workflow-draft', 'new_workflow-published', 'new_workflow-bar']);
+
+    // Add a few more states and change the exposed filter to allow multiple
+    // selections so we can check that the size of the select element does not
+    // exceed 8 options.
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/add_state', [
+      'label' => 'Foo 2',
+      'id' => 'foo2',
+    ], 'Save');
+    $this->drupalPostForm('admin/config/workflow/workflows/manage/editorial/add_state', [
+      'label' => 'Foo 3',
+      'id' => 'foo3',
+    ], 'Save');
+
+    $view_id = 'test_content_moderation_state_filter_base_table';
+    $edit['options[expose][multiple]'] = TRUE;
+    $this->drupalPostForm("admin/structure/views/nojs/handler/$view_id/default/filter/moderation_state", $edit, 'Apply');
+    $this->drupalPostForm("admin/structure/views/view/$view_id", [], 'Save');
+
+    $this->assertFilterStates(['editorial-draft', 'editorial-published', 'editorial-archived', 'editorial-foo', 'editorial-foo2', 'editorial-foo3', 'new_workflow-draft', 'new_workflow-published', 'new_workflow-bar'], TRUE);
+  }
+
+  /**
+   * Assert the states which appear in the filter.
+   *
+   * @param array $states
+   *   The states which should appear in the filter.
+   * @param bool $check_size
+   *   (optional) Whether to check that size of the select element is not
+   *   greater than 8. Defaults to FALSE.
+   */
+  protected function assertFilterStates($states, $check_size = FALSE) {
+    $this->drupalGet('/filter-test-path');
+
+    $assert_session = $this->assertSession();
+
+    // Check that the select contains the correct number of options.
+    $assert_session->elementsCount('css', '#edit-default-revision-state option', count($states));
+
+    // Check that the size of the select element does not exceed 8 options.
+    if ($check_size) {
+      $this->assertGreaterThan(8, count($states));
+      $assert_session->elementAttributeContains('css', '#edit-default-revision-state', 'size', 8);
+    }
+
+    // Check that an option exists for each of the expected states.
+    foreach ($states as $state) {
+      $assert_session->optionExists('Default Revision State', $state);
+    }
+  }
+
+  /**
+   * Asserts the views dependencies on workflow config entities.
+   *
+   * @param string[] $workflow_ids
+   *   An array of workflow IDs to check.
+   * @param \Drupal\views\ViewExecutable $view
+   *   An executable View object.
+   */
+  protected function assertWorkflowDependencies(array $workflow_ids, ViewExecutable $view) {
+    $dependencies = $view->getDependencies();
+
+    $expected = [];
+    foreach (Workflow::loadMultiple($workflow_ids) as $workflow) {
+      $expected[] = $workflow->getConfigDependencyName();
+    }
+
+    if ($expected) {
+      $this->assertSame($expected, $dependencies['config']);
+    }
+    else {
+      $this->assertTrue(!isset($dependencies['config']));
+    }
+  }
+
+}

web/core/modules/content_moderation/tests/src/Kernel/ContentModerationPermissionsTest.php

@@ -55,37 +55,13 @@ class ContentModerationPermissionsTest extends KernelTestBase {
           'id' => 'simple_workflow',
           'label' => 'Simple Workflow',
           'type' => 'content_moderation',
-          'transitions' => [
-            'publish' => [
-              'label' => 'Publish',
-              'from' => ['draft'],
-              'to' => 'published',
-              'weight' => 0,
-            ],
-            'unpublish' => [
-              'label' => 'Unpublish',
-              'from' => ['published'],
-              'to' => 'draft',
-              'weight' => 0,
-            ],
-          ],
-          'states' => [
-            'draft' => [
-              'label' => 'Draft',
-              'weight' => -5,
-            ],
-            'published' => [
-              'label' => 'Published',
-              'weight' => 0,
-            ],
-          ],
         ],
         [
           'use simple_workflow transition publish' => [
-            'title' => 'Use <em class="placeholder">Publish</em> transition from <em class="placeholder">Simple Workflow</em> workflow.',
+            'title' => '<em class="placeholder">Simple Workflow</em> workflow: Use <em class="placeholder">Publish</em> transition.',
           ],
-          'use simple_workflow transition unpublish' => [
-            'title' => 'Use <em class="placeholder">Unpublish</em> transition from <em class="placeholder">Simple Workflow</em> workflow.',
+          'use simple_workflow transition create_new_draft' => [
+            'title' => '<em class="placeholder">Simple Workflow</em> workflow: Use <em class="placeholder">Create New Draft</em> transition.',
           ],
         ],
       ],
@@ -113,7 +89,7 @@ class ContentModerationPermissionsTest extends KernelTestBase {
             ],
           ],
         ],
-        []
+        [],
       ],
     ];
   }

web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateResourceTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Kernel;
+
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\rest\Entity\RestResourceConfig;
+use Drupal\rest\RestResourceConfigInterface;
+
+/**
+ * @group content_moderation
+ */
+class ContentModerationStateResourceTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['serialization', 'rest', 'content_moderation'];
+
+  /**
+   * @see \Drupal\content_moderation\Entity\ContentModerationState
+   */
+  public function testCreateContentModerationStateResource() {
+    $this->setExpectedException(PluginNotFoundException::class, 'The "entity:content_moderation_state" plugin does not exist.');
+    RestResourceConfig::create([
+      'id' => 'entity.content_moderation_state',
+      'granularity' => RestResourceConfigInterface::RESOURCE_GRANULARITY,
+      'configuration' => [
+        'methods' => ['GET'],
+        'formats' => ['json'],
+        'authentication' => ['cookie'],
+      ],
+    ])
+      ->enable()
+      ->save();
+  }
+
+}

web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateStorageSchemaTest.php

@@ -6,7 +6,7 @@ use Drupal\content_moderation\Entity\ContentModerationState;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * Test the ContentModerationState storage schema.
@@ -16,6 +16,8 @@ use Drupal\workflows\Entity\Workflow;
  */
 class ContentModerationStateStorageSchemaTest extends KernelTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -45,7 +47,7 @@ class ContentModerationStateStorageSchemaTest extends KernelTestBase {
     NodeType::create([
       'type' => 'example',
     ])->save();
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->save();
   }

web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php

@@ -3,15 +3,16 @@
 namespace Drupal\Tests\content_moderation\Kernel;
 
 use Drupal\content_moderation\Entity\ContentModerationState;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityStorageException;
-use Drupal\entity_test\Entity\EntityTestBundle;
-use Drupal\entity_test\Entity\EntityTestWithBundle;
-use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTestRev;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 use Drupal\workflows\Entity\Workflow;
 
 /**
@@ -21,13 +22,21 @@ use Drupal\workflows\Entity\Workflow;
  */
 class ContentModerationStateTest extends KernelTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * {@inheritdoc}
    */
   public static $modules = [
     'entity_test',
     'node',
+    'block',
     'block_content',
+    'media',
+    'media_test_source',
+    'image',
+    'file',
+    'field',
     'content_moderation',
     'user',
     'system',
@@ -51,13 +60,16 @@ class ContentModerationStateTest extends KernelTestBase {
     $this->installSchema('node', 'node_access');
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test_with_bundle');
     $this->installEntitySchema('entity_test_rev');
     $this->installEntitySchema('entity_test_no_bundle');
     $this->installEntitySchema('entity_test_mulrevpub');
     $this->installEntitySchema('block_content');
+    $this->installEntitySchema('media');
+    $this->installEntitySchema('file');
     $this->installEntitySchema('content_moderation_state');
     $this->installConfig('content_moderation');
+    $this->installSchema('file', 'file_usage');
+    $this->installConfig(['field', 'system', 'image', 'file', 'media']);
 
     $this->entityTypeManager = $this->container->get('entity_type.manager');
   }
@@ -68,33 +80,7 @@ class ContentModerationStateTest extends KernelTestBase {
    * @dataProvider basicModerationTestCases
    */
   public function testBasicModeration($entity_type_id) {
-    // Make the 'entity_test_with_bundle' entity type revisionable.
-    if ($entity_type_id == 'entity_test_with_bundle') {
-      $this->setEntityTestWithBundleKeys(['revision' => 'revision_id']);
-    }
-
-    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
-    $bundle_id = $entity_type_id;
-    $bundle_entity_type_id = $this->entityTypeManager->getDefinition($entity_type_id)->getBundleEntityType();
-    if ($bundle_entity_type_id) {
-      $bundle_entity_type_definition = $this->entityTypeManager->getDefinition($bundle_entity_type_id);
-      $entity_type_storage = $this->entityTypeManager->getStorage($bundle_entity_type_id);
-
-      $entity_type = $entity_type_storage->create([
-        $bundle_entity_type_definition->getKey('id') => 'example',
-      ]);
-      $entity_type->save();
-      $bundle_id = $entity_type->id();
-    }
-
-    $workflow = Workflow::load('editorial');
-    $workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, $bundle_id);
-    $workflow->save();
-
-    $entity = $entity_storage->create([
-      'title' => 'Test title',
-      $this->entityTypeManager->getDefinition($entity_type_id)->getKey('bundle') => $bundle_id,
-    ]);
+    $entity = $this->createEntity($entity_type_id);
     if ($entity instanceof EntityPublishedInterface) {
       $entity->setUnpublished();
     }
@@ -145,6 +131,7 @@ class ContentModerationStateTest extends KernelTestBase {
     $entity->save();
 
     // Revert to the previous (published) revision.
+    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
     $previous_revision = $entity_storage->loadRevision(4);
     $previous_revision->isDefaultRevision(TRUE);
     $previous_revision->setNewRevision(TRUE);
@@ -174,8 +161,8 @@ class ContentModerationStateTest extends KernelTestBase {
       'Block content' => [
         'block_content',
       ],
-      'Test Entity with Bundle' => [
-        'entity_test_with_bundle',
+      'Media' => [
+        'media',
       ],
       'Test entity - revisions, data table, and published interface' => [
         'entity_test_mulrevpub',
@@ -189,6 +176,97 @@ class ContentModerationStateTest extends KernelTestBase {
     ];
   }
 
+  /**
+   * Tests removal of content moderation state entity.
+   *
+   * @dataProvider basicModerationTestCases
+   */
+  public function testContentModerationStateDataRemoval($entity_type_id) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = $this->createEntity($entity_type_id);
+    $entity->save();
+    $entity = $this->reloadEntity($entity);
+    $entity->delete();
+    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+    $this->assertFalse($content_moderation_state);
+  }
+
+  /**
+   * Tests removal of content moderation state entity revisions.
+   *
+   * @dataProvider basicModerationTestCases
+   */
+  public function testContentModerationStateRevisionDataRemoval($entity_type_id) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = $this->createEntity($entity_type_id);
+    $entity->save();
+    $revision = clone $entity;
+    $revision->isDefaultRevision(FALSE);
+    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($revision);
+    $this->assertTrue($content_moderation_state);
+    $entity = $this->reloadEntity($entity);
+    $entity->setNewRevision(TRUE);
+    $entity->save();
+    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+    $entity_storage->deleteRevision($revision->getRevisionId());
+    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($revision);
+    $this->assertFalse($content_moderation_state);
+    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+    $this->assertTrue($content_moderation_state);
+  }
+
+  /**
+   * Tests removal of content moderation state pending entity revisions.
+   *
+   * @dataProvider basicModerationTestCases
+   */
+  public function testContentModerationStatePendingRevisionDataRemoval($entity_type_id) {
+    $entity = $this->createEntity($entity_type_id);
+    $entity->moderation_state = 'published';
+    $entity->save();
+    $entity->setNewRevision(TRUE);
+    $entity->moderation_state = 'draft';
+    $entity->save();
+
+    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+    $this->assertTrue($content_moderation_state);
+
+    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+    $entity_storage->deleteRevision($entity->getRevisionId());
+
+    $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+    $this->assertFalse($content_moderation_state);
+  }
+
+  /**
+   * Tests removal of content moderation state translations.
+   *
+   * @dataProvider basicModerationTestCases
+   */
+  public function testContentModerationStateTranslationDataRemoval($entity_type_id) {
+    // Test content moderation state translation deletion.
+    if ($this->entityTypeManager->getDefinition($entity_type_id)->isTranslatable()) {
+      /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+      $entity = $this->createEntity($entity_type_id);
+      $langcode = 'it';
+      ConfigurableLanguage::createFromLangcode($langcode)
+        ->save();
+      $entity->save();
+      $translation = $entity->addTranslation($langcode, ['title' => 'Titolo test']);
+      // Make sure we add values for all of the required fields.
+      if ($entity_type_id == 'block_content') {
+        $translation->info = $this->randomString();
+      }
+      $translation->save();
+      $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+      $this->assertTrue($content_moderation_state->hasTranslation($langcode));
+      $entity->removeTranslation($langcode);
+      $entity->save();
+      $content_moderation_state = ContentModerationState::loadFromModeratedEntity($entity);
+      $this->assertFalse($content_moderation_state->hasTranslation($langcode));
+    }
+  }
+
   /**
    * Tests basic multilingual content moderation through the API.
    */
@@ -200,7 +278,7 @@ class ContentModerationStateTest extends KernelTestBase {
     ]);
     $node_type->save();
 
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->save();
 
@@ -305,38 +383,79 @@ class ContentModerationStateTest extends KernelTestBase {
     $this->assertEquals(6, $english_node->getRevisionId());
   }
 
+  /**
+   * Tests moderation when the moderation_state field has a config override.
+   */
+  public function testModerationWithFieldConfigOverride() {
+    NodeType::create([
+      'type' => 'test_type',
+    ])->save();
+
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'test_type');
+    $workflow->save();
+
+    $fields = $this->container->get('entity_field.manager')->getFieldDefinitions('node', 'test_type');
+    $field_config = $fields['moderation_state']->getConfig('test_type');
+    $field_config->setLabel('Field Override!');
+    $field_config->save();
+
+    $node = Node::create([
+      'title' => 'Test node',
+      'type' => 'test_type',
+    ]);
+    $node->save();
+    $this->assertFalse($node->isPublished());
+    $this->assertEquals('draft', $node->moderation_state->value);
+
+    $node->moderation_state = 'published';
+    $node->save();
+    $this->assertTrue($node->isPublished());
+    $this->assertEquals('published', $node->moderation_state->value);
+  }
+
+  /**
+   * Tests that entities with special languages can be moderated.
+   */
+  public function testModerationWithSpecialLanguages() {
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
+    $workflow->save();
+
+    // Create a test entity.
+    $entity = EntityTestRev::create([
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ]);
+    $entity->save();
+    $this->assertEquals('draft', $entity->moderation_state->value);
+
+    $entity->moderation_state->value = 'published';
+    $entity->save();
+
+    $this->assertEquals('published', EntityTestRev::load($entity->id())->moderation_state->value);
+  }
+
   /**
    * Tests that a non-translatable entity type with a langcode can be moderated.
    */
   public function testNonTranslatableEntityTypeModeration() {
-    // Make the 'entity_test_with_bundle' entity type revisionable.
-    $this->setEntityTestWithBundleKeys(['revision' => 'revision_id']);
-
-    // Create a test bundle.
-    $entity_test_bundle = EntityTestBundle::create([
-      'id' => 'example',
-    ]);
-    $entity_test_bundle->save();
-
-    $workflow = Workflow::load('editorial');
-    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_with_bundle', 'example');
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
     $workflow->save();
 
     // Check that the tested entity type is not translatable.
-    $entity_type = \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
+    $entity_type = \Drupal::entityTypeManager()->getDefinition('entity_test_rev');
     $this->assertFalse($entity_type->isTranslatable(), 'The test entity type is not translatable.');
 
     // Create a test entity.
-    $entity_test_with_bundle = EntityTestWithBundle::create([
-      'type' => 'example'
-    ]);
-    $entity_test_with_bundle->save();
-    $this->assertEquals('draft', $entity_test_with_bundle->moderation_state->value);
+    $entity = EntityTestRev::create();
+    $entity->save();
+    $this->assertEquals('draft', $entity->moderation_state->value);
 
-    $entity_test_with_bundle->moderation_state->value = 'published';
-    $entity_test_with_bundle->save();
+    $entity->moderation_state->value = 'published';
+    $entity->save();
 
-    $this->assertEquals('published', EntityTestWithBundle::load($entity_test_with_bundle->id())->moderation_state->value);
+    $this->assertEquals('published', EntityTestRev::load($entity->id())->moderation_state->value);
   }
 
   /**
@@ -344,54 +463,35 @@ class ContentModerationStateTest extends KernelTestBase {
    * moderated.
    */
   public function testNonLangcodeEntityTypeModeration() {
-    // Make the 'entity_test_with_bundle' entity type revisionable and unset
-    // the langcode entity key.
-    $this->setEntityTestWithBundleKeys(['revision' => 'revision_id'], ['langcode']);
+    // Unset the langcode entity key for 'entity_test_rev'.
+    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_rev');
+    $keys = $entity_type->getKeys();
+    unset($keys['langcode']);
+    $entity_type->set('entity_keys', $keys);
+    \Drupal::state()->set('entity_test_rev.entity_type', $entity_type);
 
-    // Create a test bundle.
-    $entity_test_bundle = EntityTestBundle::create([
-      'id' => 'example',
-    ]);
-    $entity_test_bundle->save();
+    // Update the entity type in order to remove the 'langcode' field.
+    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
 
-    $workflow = Workflow::load('editorial');
-    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_with_bundle', 'example');
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
     $workflow->save();
 
-    // Check that the tested entity type is not translatable.
-    $entity_type = \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
+    // Check that the tested entity type is not translatable and does not have a
+    // 'langcode' entity key.
+    $entity_type = \Drupal::entityTypeManager()->getDefinition('entity_test_rev');
     $this->assertFalse($entity_type->isTranslatable(), 'The test entity type is not translatable.');
+    $this->assertFalse($entity_type->getKey('langcode'), "The test entity type does not have a 'langcode' entity key.");
 
     // Create a test entity.
-    $entity_test_with_bundle = EntityTestWithBundle::create([
-      'type' => 'example'
-    ]);
-    $entity_test_with_bundle->save();
-    $this->assertEquals('draft', $entity_test_with_bundle->moderation_state->value);
+    $entity = EntityTestRev::create();
+    $entity->save();
+    $this->assertEquals('draft', $entity->moderation_state->value);
 
-    $entity_test_with_bundle->moderation_state->value = 'published';
-    $entity_test_with_bundle->save();
+    $entity->moderation_state->value = 'published';
+    $entity->save();
 
-    $this->assertEquals('published', EntityTestWithBundle::load($entity_test_with_bundle->id())->moderation_state->value);
-  }
-
-  /**
-   * Set the keys on the test entity type.
-   *
-   * @param array $keys
-   *   The entity keys to override
-   * @param array $remove_keys
-   *   Keys to remove.
-   */
-  protected function setEntityTestWithBundleKeys($keys, $remove_keys = []) {
-    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
-    $original_keys = $entity_type->getKeys();
-    foreach ($remove_keys as $remove_key) {
-      unset($original_keys[$remove_key]);
-    }
-    $entity_type->set('entity_keys', $keys + $original_keys);
-    \Drupal::state()->set('entity_test_with_bundle.entity_type', $entity_type);
-    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+    $this->assertEquals('published', EntityTestRev::load($entity->id())->moderation_state->value);
   }
 
   /**
@@ -403,7 +503,7 @@ class ContentModerationStateTest extends KernelTestBase {
     ]);
     $node_type->save();
 
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     // Test both a config and non-config based bundle and entity type.
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
@@ -423,7 +523,7 @@ class ContentModerationStateTest extends KernelTestBase {
     $this->assertEquals([
       'entity_test_no_bundle',
       'entity_test_rev',
-      'node'
+      'node',
     ], $workflow->getTypePlugin()->getEntityTypes());
 
     // Delete the node type and ensure it is removed from the workflow.
@@ -439,6 +539,140 @@ class ContentModerationStateTest extends KernelTestBase {
     $this->assertEquals([], $entity_types);
   }
 
+  /**
+   * Test the content moderation workflow dependencies for non-config bundles.
+   */
+  public function testWorkflowNonConfigBundleDependencies() {
+    // Create a bundle not based on any particular configuration.
+    entity_test_create_bundle('test_bundle');
+
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test', 'test_bundle');
+    $workflow->save();
+
+    // Ensure the bundle is correctly added to the workflow.
+    $this->assertEquals([
+      'module' => [
+        'content_moderation',
+        'entity_test',
+      ],
+    ], $workflow->getDependencies());
+    $this->assertEquals([
+      'test_bundle',
+    ], $workflow->getTypePlugin()->getBundlesForEntityType('entity_test'));
+
+    // Delete the test bundle to ensure the workflow entity responds
+    // appropriately.
+    entity_test_delete_bundle('test_bundle');
+
+    $workflow = Workflow::load('editorial');
+    $this->assertEquals([], $workflow->getTypePlugin()->getBundlesForEntityType('entity_test'));
+    $this->assertEquals([
+      'module' => [
+        'content_moderation',
+      ],
+    ], $workflow->getDependencies());
+  }
+
+  /**
+   * Test the revision default state of the moderation state entity revisions.
+   *
+   * @param string $entity_type_id
+   *   The ID of entity type to be tested.
+   *
+   * @dataProvider basicModerationTestCases
+   */
+  public function testRevisionDefaultState($entity_type_id) {
+    // Check that the revision default state of the moderated entity and the
+    // content moderation state entity always match.
+    /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
+    $storage = $this->entityTypeManager->getStorage($entity_type_id);
+    /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $cms_storage */
+    $cms_storage = $this->entityTypeManager->getStorage('content_moderation_state');
+
+    $entity = $this->createEntity($entity_type_id);
+    $entity->get('moderation_state')->value = 'published';
+    $storage->save($entity);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+    $cms_entity = $cms_storage->loadUnchanged(1);
+    $this->assertEquals($entity->getLoadedRevisionId(), $cms_entity->get('content_entity_revision_id')->value);
+
+    $entity->get('moderation_state')->value = 'published';
+    $storage->save($entity);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+    $cms_entity = $cms_storage->loadUnchanged(1);
+    $this->assertEquals($entity->getLoadedRevisionId(), $cms_entity->get('content_entity_revision_id')->value);
+
+    $entity->get('moderation_state')->value = 'draft';
+    $storage->save($entity);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+    $cms_entity = $cms_storage->loadUnchanged(1);
+    $this->assertEquals($entity->getLoadedRevisionId() - 1, $cms_entity->get('content_entity_revision_id')->value);
+
+    $entity->get('moderation_state')->value = 'published';
+    $storage->save($entity);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $cms_entity */
+    $cms_entity = $cms_storage->loadUnchanged(1);
+    $this->assertEquals($entity->getLoadedRevisionId(), $cms_entity->get('content_entity_revision_id')->value);
+  }
+
+  /**
+   * Creates an entity.
+   *
+   * The entity will have required fields populated and the corresponding bundle
+   * will be enabled for content moderation.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID.
+   *
+   * @return \Drupal\Core\Entity\ContentEntityInterface
+   *   The created entity.
+   */
+  protected function createEntity($entity_type_id) {
+    $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
+
+    $bundle_id = $entity_type_id;
+    // Set up a bundle entity type for the specified entity type, if needed.
+    if ($bundle_entity_type_id = $entity_type->getBundleEntityType()) {
+      $bundle_entity_type = $this->entityTypeManager->getDefinition($bundle_entity_type_id);
+      $bundle_entity_storage = $this->entityTypeManager->getStorage($bundle_entity_type_id);
+
+      $bundle_id = 'example';
+      if (!$bundle_entity_storage->load($bundle_id)) {
+        $bundle_entity = $bundle_entity_storage->create([
+          $bundle_entity_type->getKey('id') => 'example',
+        ]);
+        if ($entity_type_id == 'media') {
+          $bundle_entity->set('source', 'test');
+          $bundle_entity->save();
+          $source_field = $bundle_entity->getSource()->createSourceField($bundle_entity);
+          $source_field->getFieldStorageDefinition()->save();
+          $source_field->save();
+          $bundle_entity->set('source_configuration', [
+            'source_field' => $source_field->getName(),
+          ]);
+        }
+        $bundle_entity->save();
+      }
+    }
+
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, $bundle_id);
+    $workflow->save();
+
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+    $entity = $entity_storage->create([
+      $entity_type->getKey('label') => 'Test title',
+      $entity_type->getKey('bundle') => $bundle_id,
+    ]);
+    // Make sure we add values for all of the required fields.
+    if ($entity_type_id == 'block_content') {
+      $entity->info = $this->randomString();
+    }
+    return $entity;
+  }
+
   /**
    * Reloads the entity after clearing the static cache.
    *

web/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowConfigTest.php

@@ -0,0 +1,147 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Kernel;
+
+use Drupal\Core\Config\ConfigImporterException;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+
+/**
+ * Tests how Content Moderation handles workflow config changes.
+ *
+ * @group content_moderation
+ */
+class ContentModerationWorkflowConfigTest extends KernelTestBase {
+
+  use ContentModerationTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'node',
+    'content_moderation',
+    'user',
+    'system',
+    'text',
+    'workflows',
+  ];
+
+  /**
+   * @var \Drupal\Core\Entity\EntityTypeManager
+   */
+  protected $entityTypeManager;
+
+  /**
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * @var \Drupal\workflows\Entity\Workflow
+   */
+  protected $workflow;
+
+  /**
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorage
+   */
+  protected $workflowStorage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installSchema('node', 'node_access');
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('content_moderation_state');
+    $this->installConfig(['system', 'content_moderation']);
+
+    NodeType::create([
+      'type' => 'example',
+    ])->save();
+
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()
+      ->addState('test1', 'Test one')
+      ->addState('test2', 'Test two')
+      ->addState('test3', 'Test three')
+      ->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+    $this->workflow = $workflow;
+
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+  }
+
+  /**
+   * Test deleting a state via config import.
+   */
+  public function testDeletingStateViaConfiguration() {
+    $config_sync = \Drupal::service('config.storage.sync');
+
+    // Alter the workflow data.
+    $config_data = $this->config('workflows.workflow.editorial')->get();
+    unset($config_data['type_settings']['states']['test1']);
+    $config_sync->write('workflows.workflow.editorial', $config_data);
+
+    // Alter the data of another entity type.
+    $config_data = $this->config('node.type.example')->get();
+    $config_data['description'] = 'A new description';
+    $config_sync->write('node.type.example', $config_data);
+
+    // Alter the values of simple config.
+    $config_data = $this->config('core.extension')->get();
+    $config_data['module']['node'] = 1;
+    $config_sync->write('core.extension', $config_data);
+
+    // There are no Nodes with the moderation state test1, so this should run
+    // with no errors.
+    $this->configImporter()->reset()->import();
+
+    $node = Node::create([
+      'type' => 'example',
+      'title' => 'Test title',
+      'moderation_state' => 'test2',
+    ]);
+    $node->save();
+
+    $config_data = $this->config('workflows.workflow.editorial')->get();
+    unset($config_data['type_settings']['states']['test2']);
+    unset($config_data['type_settings']['states']['test3']);
+    \Drupal::service('config.storage.sync')->write('workflows.workflow.editorial', $config_data);
+
+    // Now there is a Node with the moderation state test2, this will fail.
+    try {
+      $this->configImporter()->reset()->import();
+      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to deleted state.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.' . PHP_EOL . 'The moderation state Test two is being used, but is not in the source storage.');
+      $error_log = $this->configImporter->getErrors();
+      $expected = ['The moderation state Test two is being used, but is not in the source storage.'];
+      $this->assertEqual($expected, $error_log);
+    }
+
+    \Drupal::service('config.storage.sync')->delete('workflows.workflow.editorial');
+
+    // An error should be thrown when trying to delete an in use workflow.
+    try {
+      $this->configImporter()->reset()->import();
+      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to deleted workflow.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.' . PHP_EOL . 'The moderation state Test two is being used, but is not in the source storage.' . PHP_EOL . 'The workflow Editorial is being used, and cannot be deleted.');
+      $error_log = $this->configImporter->getErrors();
+      $expected = [
+        'The moderation state Test two is being used, but is not in the source storage.',
+        'The workflow Editorial is being used, and cannot be deleted.',
+      ];
+      $this->assertEqual($expected, $error_log);
+    }
+  }
+
+}

web/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php

@@ -17,7 +17,7 @@ class ContentModerationWorkflowTypeApiTest extends KernelTestBase {
   /**
    * A workflow for testing.
    *
-   * @var \Drupal\workflows\Entity\Workflow;
+   * @var \Drupal\workflows\Entity\Workflow
    */
   protected $workflow;
 
@@ -37,9 +37,6 @@ class ContentModerationWorkflowTypeApiTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     $this->workflow = Workflow::create(['id' => 'test', 'type' => 'content_moderation']);
-    $this->workflow
-      ->addState('draft', 'Draft')
-      ->addState('published', 'Published');
   }
 
   /**
@@ -101,4 +98,26 @@ class ContentModerationWorkflowTypeApiTest extends KernelTestBase {
     );
   }
 
+  /**
+   * @covers ::addEntityTypeAndBundle
+   * @covers ::removeEntityTypeAndBundle
+   */
+  public function testRemoveEntityTypeAndBundle() {
+    /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $workflow_plugin */
+    $workflow_plugin = $this->workflow->getTypePlugin();
+
+    // There should be no bundles for fake_node to start with.
+    $this->assertEquals([], $workflow_plugin->getBundlesForEntityType('fake_node'));
+    // Removing a bundle which is not set on the workflow should not throw an
+    // error and should still result in none being returned.
+    $workflow_plugin->removeEntityTypeAndBundle('fake_node', 'fake_page');
+    $this->assertEquals([], $workflow_plugin->getBundlesForEntityType('fake_node'));
+    // Adding a bundle for fake_node should result it in being returned, but
+    // then removing it will return no bundles for fake_node.
+    $workflow_plugin->addEntityTypeAndBundle('fake_node', 'fake_page');
+    $this->assertEquals(['fake_page'], $workflow_plugin->getBundlesForEntityType('fake_node'));
+    $workflow_plugin->removeEntityTypeAndBundle('fake_node', 'fake_page');
+    $this->assertEquals([], $workflow_plugin->getBundlesForEntityType('fake_node'));
+  }
+
 }

web/core/modules/content_moderation/tests/src/Kernel/DefaultRevisionStateTest.php

@@ -6,7 +6,7 @@ use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * Tests the correct default revision is set.
@@ -15,6 +15,8 @@ use Drupal\workflows\Entity\Workflow;
  */
 class DefaultRevisionStateTest extends KernelTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -68,7 +70,7 @@ class DefaultRevisionStateTest extends KernelTestBase {
 
     $this->container->get('content_translation.manager')->setEnabled('node', 'example', TRUE);
 
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->save();
 
@@ -83,6 +85,7 @@ class DefaultRevisionStateTest extends KernelTestBase {
     $this->assertEquals('draft', $english_node->moderation_state->value);
     $this->assertFalse($english_node->isPublished());
     $this->assertTrue($english_node->isDefaultRevision());
+    $this->assertModerationState($english_node->getRevisionId(), $english_node->language()->getId(), 'draft');
 
     // Revision 2 (fr)
     $french_node = $english_node->addTranslation('fr', ['title' => 'French title']);
@@ -90,6 +93,7 @@ class DefaultRevisionStateTest extends KernelTestBase {
     $french_node->save();
     $this->assertTrue($french_node->isPublished());
     $this->assertTrue($french_node->isDefaultRevision());
+    $this->assertModerationState($french_node->getRevisionId(), $french_node->language()->getId(), 'published');
 
     // Revision 3 (fr)
     $node = Node::load($english_node->id())->getTranslation('fr');
@@ -97,6 +101,7 @@ class DefaultRevisionStateTest extends KernelTestBase {
     $node->save();
     $this->assertFalse($node->isPublished());
     $this->assertFalse($node->isDefaultRevision());
+    $this->assertModerationState($node->getRevisionId(), $node->language()->getId(), 'draft');
 
     // Revision 4 (en)
     $latest_revision = $this->entityTypeManager->getStorage('node')->loadRevision(3);
@@ -104,6 +109,36 @@ class DefaultRevisionStateTest extends KernelTestBase {
     $latest_revision->save();
     $this->assertFalse($latest_revision->isPublished());
     $this->assertFalse($latest_revision->isDefaultRevision());
+    $this->assertModerationState($latest_revision->getRevisionId(), $latest_revision->language()->getId(), 'draft');
+  }
+
+  /**
+   * Verifies the expected moderation state revision exists.
+   *
+   * @param int $revision_id
+   *   The revision ID of the host entity.
+   * @param string $langcode
+   *   The language code of the host entity to check.
+   * @param string $expected_state
+   *   The state the content moderation state revision should be in.
+   * @param string $expected_workflow
+   *   The workflow the content moderation state revision should be using.
+   */
+  protected function assertModerationState($revision_id, $langcode, $expected_state, $expected_workflow = 'editorial') {
+    $moderation_state_storage = $this->entityTypeManager->getStorage('content_moderation_state');
+
+    $query = $moderation_state_storage->getQuery();
+    $results = $query->allRevisions()
+      ->condition('content_entity_revision_id', $revision_id)
+      ->condition('langcode', $langcode)
+      ->execute();
+    $this->assertCount(1, $results);
+
+    $moderation_state = $moderation_state_storage
+      ->loadRevision(key($results))
+      ->getTranslation($langcode);
+    $this->assertEquals($expected_state, $moderation_state->get('moderation_state')->value);
+    $this->assertEquals($expected_workflow, $moderation_state->get('workflow')->target_id);
   }
 
 }

web/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php

@@ -2,11 +2,10 @@
 
 namespace Drupal\Tests\content_moderation\Kernel;
 
-
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\EntityOperations
@@ -15,6 +14,8 @@ use Drupal\workflows\Entity\Workflow;
  */
 class EntityOperationsTest extends KernelTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -49,15 +50,15 @@ class EntityOperationsTest extends KernelTestBase {
       'label' => 'Page',
     ]);
     $node_type->save();
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'page');
     $workflow->save();
   }
 
   /**
-   * Verifies that the process of saving forward-revisions works as expected.
+   * Verifies that the process of saving pending revisions works as expected.
    */
-  public function testForwardRevisions() {
+  public function testPendingRevisions() {
     // Create a new node in draft.
     $page = Node::create([
       'type' => 'page',
@@ -68,9 +69,9 @@ class EntityOperationsTest extends KernelTestBase {
 
     $id = $page->id();
 
-    // Verify the entity saved correctly, and that the presence of forward
+    // Verify the entity saved correctly, and that the presence of pending
     // revisions doesn't affect the default node load.
-    /** @var Node $page */
+    /** @var \Drupal\node\Entity\Node $page */
     $page = Node::load($id);
     $this->assertEquals('A', $page->getTitle());
     $this->assertTrue($page->isDefaultRevision());
@@ -87,7 +88,7 @@ class EntityOperationsTest extends KernelTestBase {
     $this->assertTrue($page->isDefaultRevision());
     $this->assertTrue($page->isPublished());
 
-    // Make a new forward-revision in Draft.
+    // Make a new pending revision in Draft.
     $page->setTitle('C');
     $page->moderation_state->value = 'draft';
     $page->save();
@@ -96,7 +97,7 @@ class EntityOperationsTest extends KernelTestBase {
     $page = Node::load($id);
     $this->assertEquals('B', $page->getTitle());
 
-    // Verify we can load the forward revision, even if the mechanism is kind
+    // Verify we can load the pending revision, even if the mechanism is kind
     // of gross. Note: revisionIds() is only available on NodeStorageInterface,
     // so this won't work for non-nodes. We'd need to use entity queries. This
     // is a core bug that should get fixed.
@@ -143,7 +144,7 @@ class EntityOperationsTest extends KernelTestBase {
     $id = $page->id();
 
     // Verify the entity saved correctly.
-    /** @var Node $page */
+    /** @var \Drupal\node\Entity\Node $page */
     $page = Node::load($id);
     $this->assertEquals('A', $page->getTitle());
     $this->assertTrue($page->isDefaultRevision());

web/core/modules/content_moderation/tests/src/Kernel/EntityRevisionConverterTest.php

@@ -2,21 +2,22 @@
 
 namespace Drupal\Tests\content_moderation\Kernel;
 
-use Drupal\entity_test\Entity\EntityTest;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\workflows\Entity\Workflow;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\ParamConverter\EntityRevisionConverter
  * @group content_moderation
+ * @group legacy
  */
 class EntityRevisionConverterTest extends KernelTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   public static $modules = [
     'user',
-    'entity_test',
     'system',
     'content_moderation',
     'node',
@@ -28,74 +29,36 @@ class EntityRevisionConverterTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-
-    $this->installEntitySchema('entity_test');
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
-    $this->installEntitySchema('content_moderation_state');
-    $this->installSchema('system', 'router');
     $this->installSchema('system', 'sequences');
     $this->installSchema('node', 'node_access');
-    \Drupal::service('router.builder')->rebuild();
   }
 
   /**
    * @covers ::convert
+   * @expectedDeprecationMessage The load_pending_revision flag has been deprecated. You should use load_latest_revision instead.
    */
-  public function testConvertNonRevisionableEntityType() {
-    $entity_test = EntityTest::create([
-      'name' => 'test',
-    ]);
-
-    $entity_test->save();
-
-    /** @var \Symfony\Component\Routing\RouterInterface $router */
-    $router = \Drupal::service('router.no_access_checks');
-    $result = $router->match('/entity_test/' . $entity_test->id());
-
-    $this->assertInstanceOf(EntityTest::class, $result['entity_test']);
-    $this->assertEquals($entity_test->getRevisionId(), $result['entity_test']->getRevisionId());
-  }
-
-  /**
-   * @covers ::convert
-   */
-  public function testConvertWithRevisionableEntityType() {
-    $this->installConfig(['content_moderation']);
-    $node_type = NodeType::create([
+  public function testDeprecatedLoadPendingRevisionFlag() {
+    NodeType::create([
       'type' => 'article',
-    ]);
-    $node_type->save();
-    $workflow = Workflow::load('editorial');
-    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'article');
-    $workflow->save();
+    ])->save();
 
-    $revision_ids = [];
     $node = Node::create([
       'title' => 'test',
       'type' => 'article',
     ]);
-    $node->moderation_state->value = 'published';
     $node->save();
 
-    $revision_ids[] = $node->getRevisionId();
-
+    $node->isDefaultRevision(FALSE);
     $node->setNewRevision(TRUE);
     $node->save();
-    $revision_ids[] = $node->getRevisionId();
 
-    $node->setNewRevision(TRUE);
-    $node->moderation_state->value = 'draft';
-    $node->save();
-    $revision_ids[] = $node->getRevisionId();
-
-    /** @var \Symfony\Component\Routing\RouterInterface $router */
-    $router = \Drupal::service('router.no_access_checks');
-    $result = $router->match('/node/' . $node->id() . '/edit');
-
-    $this->assertInstanceOf(Node::class, $result['node']);
-    $this->assertEquals($revision_ids[2], $result['node']->getRevisionId());
-    $this->assertFalse($result['node']->isDefaultRevision());
+    $converted = $this->container->get('paramconverter.latest_revision')->convert($node->id(), [
+      'load_pending_revision' => TRUE,
+      'type' => 'entity:node',
+    ], 'node', []);
+    $this->assertEquals($converted->getLoadedRevisionId(), $node->getLoadedRevisionId());
   }
 
 }

web/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php

@@ -6,7 +6,8 @@ use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+use Drupal\Tests\user\Traits\UserCreationTrait;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\Plugin\Validation\Constraint\ModerationStateConstraintValidator
@@ -14,6 +15,9 @@ use Drupal\workflows\Entity\Workflow;
  */
 class EntityStateChangeValidationTest extends KernelTestBase {
 
+  use ContentModerationTestTrait;
+  use UserCreationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -27,6 +31,13 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     'workflows',
   ];
 
+  /**
+   * An admin user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $adminUser;
+
   /**
    * {@inheritdoc}
    */
@@ -38,6 +49,9 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $this->installEntitySchema('user');
     $this->installEntitySchema('content_moderation_state');
     $this->installConfig('content_moderation');
+    $this->installSchema('system', ['sequences']);
+
+    $this->adminUser = $this->createUser(array_keys($this->container->get('user.permissions')->getPermissions()));
   }
 
   /**
@@ -46,11 +60,13 @@ class EntityStateChangeValidationTest extends KernelTestBase {
    * @covers ::validate
    */
   public function testValidTransition() {
+    $this->setCurrentUser($this->adminUser);
+
     $node_type = NodeType::create([
       'type' => 'example',
     ]);
     $node_type->save();
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->save();
 
@@ -74,11 +90,13 @@ class EntityStateChangeValidationTest extends KernelTestBase {
    * @covers ::validate
    */
   public function testInvalidTransition() {
+    $this->setCurrentUser($this->adminUser);
+
     $node_type = NodeType::create([
       'type' => 'example',
     ]);
     $node_type->save();
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->save();
 
@@ -96,10 +114,140 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $this->assertEquals('Invalid state transition from <em class="placeholder">Draft</em> to <em class="placeholder">Archived</em>', $violations->get(0)->getMessage());
   }
 
+  /**
+   * Test validation with an invalid state.
+   */
+  public function testInvalidState() {
+    $node_type = NodeType::create([
+      'type' => 'example',
+    ]);
+    $node_type->save();
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
+    $node = Node::create([
+      'type' => 'example',
+      'title' => 'Test title',
+    ]);
+    $node->moderation_state->value = 'invalid_state';
+    $violations = $node->validate();
+
+    $this->assertCount(1, $violations);
+    $this->assertEquals('State <em class="placeholder">invalid_state</em> does not exist on <em class="placeholder">Editorial</em> workflow', $violations->get(0)->getMessage());
+  }
+
+  /**
+   * Test validation with content that has no initial state or an invalid state.
+   */
+  public function testInvalidStateWithoutExisting() {
+    $this->setCurrentUser($this->adminUser);
+    // Create content without moderation enabled for the content type.
+    $node_type = NodeType::create([
+      'type' => 'example',
+    ]);
+    $node_type->save();
+    $node = Node::create([
+      'type' => 'example',
+      'title' => 'Test title',
+    ]);
+    $node->save();
+
+    // Enable moderation to test validation on existing content, with no
+    // explicit state.
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addState('deleted_state', 'Deleted state');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
+    // Validate the invalid state.
+    $node->moderation_state->value = 'invalid_state';
+    $violations = $node->validate();
+    $this->assertCount(1, $violations);
+
+    // Assign the node to a state we're going to delete.
+    $node->moderation_state->value = 'deleted_state';
+    $node->save();
+
+    // Delete the state so $node->original contains an invalid state when
+    // validating.
+    $workflow->getTypePlugin()->deleteState('deleted_state');
+    $workflow->save();
+
+    // When there is an invalid state, the content will revert to "draft". This
+    // will allow a draft to draft transition.
+    $node->moderation_state->value = 'draft';
+    $violations = $node->validate();
+    $this->assertCount(0, $violations);
+    // This will disallow a draft to archived transition.
+    $node->moderation_state->value = 'archived';
+    $violations = $node->validate();
+    $this->assertCount(1, $violations);
+  }
+
+  /**
+   * Test state transition validation with multiple languages.
+   */
+  public function testInvalidStateMultilingual() {
+    $this->setCurrentUser($this->adminUser);
+
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    $node_type = NodeType::create([
+      'type' => 'example',
+    ]);
+    $node_type->save();
+
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
+    $node = Node::create([
+      'type' => 'example',
+      'title' => 'English Published Node',
+      'langcode' => 'en',
+      'moderation_state' => 'published',
+    ]);
+    $node->save();
+
+    $node_fr = $node->addTranslation('fr', $node->toArray());
+    $node_fr->setTitle('French Published Node');
+    $node_fr->save();
+    $this->assertEquals('published', $node_fr->moderation_state->value);
+
+    // Create a pending revision of the original node.
+    $node->moderation_state = 'draft';
+    $node->setNewRevision(TRUE);
+    $node->isDefaultRevision(FALSE);
+    $node->save();
+
+    // For the pending english revision, there should be a violation from draft
+    // to archived.
+    $node->moderation_state = 'archived';
+    $violations = $node->validate();
+    $this->assertCount(1, $violations);
+    $this->assertEquals('Invalid state transition from <em class="placeholder">Draft</em> to <em class="placeholder">Archived</em>', $violations->get(0)->getMessage());
+
+    // From the default french published revision, there should be none.
+    $node_fr = Node::load($node->id())->getTranslation('fr');
+    $this->assertEquals('published', $node_fr->moderation_state->value);
+    $node_fr->moderation_state = 'archived';
+    $violations = $node_fr->validate();
+    $this->assertCount(0, $violations);
+
+    // From the latest french revision, there should also be no violation.
+    $node_fr = Node::load($node->id())->getTranslation('fr');
+    $this->assertEquals('published', $node_fr->moderation_state->value);
+    $node_fr->moderation_state = 'archived';
+    $violations = $node_fr->validate();
+    $this->assertCount(0, $violations);
+  }
+
   /**
    * Tests that content without prior moderation information can be moderated.
    */
-  public function testLegacyContent() {
+  public function testExistingContentWithNoModeration() {
+    $this->setCurrentUser($this->adminUser);
+
     $node_type = NodeType::create([
       'type' => 'example',
     ]);
@@ -114,7 +262,7 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $nid = $node->id();
 
     // Enable moderation for our node type.
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->save();
 
@@ -133,7 +281,9 @@ class EntityStateChangeValidationTest extends KernelTestBase {
   /**
    * Tests that content without prior moderation information can be translated.
    */
-  public function testLegacyMultilingualContent() {
+  public function testExistingMultilingualContentWithNoModeration() {
+    $this->setCurrentUser($this->adminUser);
+
     // Enable French.
     ConfigurableLanguage::createFromLangcode('fr')->save();
 
@@ -160,7 +310,7 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $node_fr->save();
 
     // Enable moderation for our node type.
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->save();
 
@@ -173,4 +323,81 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $node_fr->save();
   }
 
+  /**
+   * @dataProvider transitionAccessValidationTestCases
+   */
+  public function testTransitionAccessValidation($permissions, $target_state, $messages) {
+    $node_type = NodeType::create([
+      'type' => 'example',
+    ]);
+    $node_type->save();
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addState('foo', 'Foo');
+    $workflow->getTypePlugin()->addTransition('draft_to_foo', 'Draft to foo', ['draft'], 'foo');
+    $workflow->getTypePlugin()->addTransition('foo_to_foo', 'Foo to foo', ['foo'], 'foo');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
+    $this->setCurrentUser($this->createUser($permissions));
+
+    $node = Node::create([
+      'type' => 'example',
+      'title' => 'Test content',
+      'moderation_state' => $target_state,
+    ]);
+    $this->assertTrue($node->isNew());
+    $violations = $node->validate();
+    $this->assertCount(count($messages), $violations);
+    foreach ($messages as $i => $message) {
+      $this->assertEquals($message, $violations->get($i)->getMessage());
+    }
+  }
+
+  /**
+   * Test cases for ::testTransitionAccessValidation.
+   */
+  public function transitionAccessValidationTestCases() {
+    return [
+      'Invalid transition, no permissions validated' => [
+        [],
+        'archived',
+        ['Invalid state transition from <em class="placeholder">Draft</em> to <em class="placeholder">Archived</em>'],
+      ],
+      'Valid transition, missing permission' => [
+        [],
+        'published',
+        ['You do not have access to transition from <em class="placeholder">Draft</em> to <em class="placeholder">Published</em>'],
+      ],
+      'Valid transition, granted published permission' => [
+        ['use editorial transition publish'],
+        'published',
+        [],
+      ],
+      'Valid transition, granted draft permission' => [
+        ['use editorial transition create_new_draft'],
+        'draft',
+        [],
+      ],
+      'Valid transition, incorrect permission granted' => [
+        ['use editorial transition create_new_draft'],
+        'published',
+        ['You do not have access to transition from <em class="placeholder">Draft</em> to <em class="placeholder">Published</em>'],
+      ],
+      // Test with an additional state and set of transitions, since the
+      // "published" transition can start from either "draft" or "published", it
+      // does not capture bugs that fail to correctly distinguish the initial
+      // workflow state from the set state of a new entity.
+      'Valid transition, granted foo permission' => [
+        ['use editorial transition draft_to_foo'],
+        'foo',
+        [],
+      ],
+      'Valid transition, incorrect  foo permission granted' => [
+        ['use editorial transition foo_to_foo'],
+        'foo',
+        ['You do not have access to transition from <em class="placeholder">Draft</em> to <em class="placeholder">Foo</em>'],
+      ],
+    ];
+  }
+
 }

web/core/modules/content_moderation/tests/src/Kernel/EntityTypeInfoTest.php

@@ -20,6 +20,7 @@ class EntityTypeInfoTest extends KernelTestBase {
    */
   public static $modules = [
     'content_moderation',
+    'workflows',
     'entity_test',
   ];
 
@@ -60,4 +61,34 @@ class EntityTypeInfoTest extends KernelTestBase {
     $this->assertTrue($base_fields['moderation_state']->isTranslatable());
   }
 
+  /**
+   * Test the correct entity types have moderation added.
+   *
+   * @covers ::entityTypeAlter
+   *
+   * @dataProvider providerTestEntityTypeAlter
+   */
+  public function testEntityTypeAlter($entity_type_id, $moderatable) {
+    $entity_types = $this->entityTypeManager->getDefinitions();
+    $this->assertSame($moderatable, $entity_types[$entity_type_id]->hasHandlerClass('moderation'));
+  }
+
+  /**
+   * Provides test data for testEntityTypeAlter().
+   *
+   * @return array
+   *   An array of test cases, where each test case is an array with the
+   *   following values:
+   *   - An entity type ID.
+   *   - Whether the entity type is moderatable or not.
+   */
+  public function providerTestEntityTypeAlter() {
+    $tests = [];
+    $tests['non_internal_non_revisionable'] = ['entity_test', FALSE];
+    $tests['non_internal_revisionable'] = ['entity_test_rev', TRUE];
+    $tests['internal_non_revisionable'] = ['entity_test_no_label', FALSE];
+    $tests['internal_revisionable'] = ['content_moderation_state', FALSE];
+    return $tests;
+  }
+
 }

web/core/modules/content_moderation/tests/src/Kernel/InitialStateTest.php

@@ -6,7 +6,7 @@ use Drupal\entity_test\Entity\EntityTestRev;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * Tests the correct initial states are set on install.
@@ -15,6 +15,8 @@ use Drupal\workflows\Entity\Workflow;
  */
 class InitialStateTest extends KernelTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -66,7 +68,7 @@ class InitialStateTest extends KernelTestBase {
     $entity_test->save();
 
     \Drupal::service('module_installer')->install(['content_moderation'], TRUE);
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
     $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
     $workflow->save();
@@ -77,6 +79,12 @@ class InitialStateTest extends KernelTestBase {
     $this->assertEquals('draft', $loaded_unpublished_node->moderation_state->value);
     $this->assertEquals('published', $loaded_published_node->moderation_state->value);
     $this->assertEquals('draft', $loaded_entity_test->moderation_state->value);
+
+    $presave_node = Node::create([
+      'type' => 'example',
+      'title' => 'Presave node',
+    ]);
+    $this->assertEquals('draft', $presave_node->moderation_state->value);
   }
 
 }

web/core/modules/content_moderation/tests/src/Kernel/ModerationInformationTest.php

@@ -0,0 +1,157 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Kernel;
+
+use Drupal\entity_test\Entity\EntityTestMulRevPub;
+use Drupal\entity_test\Entity\EntityTestRev;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+
+/**
+ * @coversDefaultClass \Drupal\content_moderation\ModerationInformation
+ * @group content_moderation
+ */
+class ModerationInformationTest extends KernelTestBase {
+
+  use ContentModerationTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'content_moderation',
+    'entity_test',
+    'user',
+    'workflows',
+    'language',
+    'content_translation',
+  ];
+
+  /**
+   * The moderation information service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInformation;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_rev');
+    $this->installEntitySchema('entity_test_mulrevpub');
+    $this->installEntitySchema('content_moderation_state');
+    $this->installConfig(['content_moderation']);
+
+    $this->moderationInformation = $this->container->get('content_moderation.moderation_information');
+
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    $workflow = $this->createEditorialWorkflow();
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_mulrevpub', 'entity_test_mulrevpub');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
+    $workflow->save();
+
+    $this->container->get('content_translation.manager')->setEnabled('entity_test_mulrevpub', 'entity_test_mulrevpub', TRUE);
+  }
+
+  /**
+   * @covers ::getDefaultRevisionId
+   * @covers ::getLatestRevisionId
+   */
+  public function testDefaultAndLatestRevisionId() {
+    $entity_test_rev = EntityTestRev::create([
+      'name' => 'Default Revision',
+      'moderation_state' => 'published',
+    ]);
+    $entity_test_rev->save();
+
+    $entity_test_rev->name = 'Pending revision';
+    $entity_test_rev->moderation_state = 'draft';
+    $entity_test_rev->save();
+
+    // Check that moderation information service returns the correct default
+    // revision ID.
+    $default_revision_id = $this->moderationInformation->getDefaultRevisionId('entity_test_rev', $entity_test_rev->id());
+    $this->assertSame(1, $default_revision_id);
+
+    // Check that moderation information service returns the correct latest
+    // revision ID.
+    $latest_revision_id = $this->moderationInformation->getLatestRevisionId('entity_test_rev', $entity_test_rev->id());
+    $this->assertSame(2, $latest_revision_id);
+  }
+
+  /**
+   * @covers ::isDefaultRevisionPublished
+   * @dataProvider isDefaultRevisionPublishedTestCases
+   */
+  public function testIsDefaultRevisionPublished($initial_state, $final_state, $initial_is_default_published, $final_is_default_published) {
+    $entity = EntityTestMulRevPub::create([
+      'moderation_state' => $initial_state,
+    ]);
+    $entity->save();
+    $this->assertEquals($initial_is_default_published, $this->moderationInformation->isDefaultRevisionPublished($entity));
+
+    $entity->moderation_state = $final_state;
+    $entity->save();
+    $this->assertEquals($final_is_default_published, $this->moderationInformation->isDefaultRevisionPublished($entity));
+  }
+
+  /**
+   * Test cases for ::testIsDefaultRevisionPublished.
+   */
+  public function isDefaultRevisionPublishedTestCases() {
+    return [
+      'Draft to draft' => [
+        'draft',
+        'draft',
+        FALSE,
+        FALSE,
+      ],
+      'Draft to published' => [
+        'draft',
+        'published',
+        FALSE,
+        TRUE,
+      ],
+      'Published to published' => [
+        'published',
+        'published',
+        TRUE,
+        TRUE,
+      ],
+      'Published to draft' => [
+        'published',
+        'draft',
+        TRUE,
+        TRUE,
+      ],
+    ];
+  }
+
+  /**
+   * @covers ::isDefaultRevisionPublished
+   */
+  public function testIsDefaultRevisionPublishedMultilingual() {
+    $entity = EntityTestMulRevPub::create([
+      'moderation_state' => 'draft',
+    ]);
+    $entity->save();
+    $this->assertEquals('draft', $entity->moderation_state->value);
+
+    $translated = $entity->addTranslation('de');
+    $translated->moderation_state = 'published';
+    $translated->save();
+    $this->assertEquals('published', $translated->moderation_state->value);
+
+    // Test a scenario where the default revision exists with the default
+    // language in a draft state and a non-default language in a published
+    // state. The method returns TRUE if any of the languages for the default
+    // revision are in a published state.
+    $this->assertEquals(TRUE, $this->moderationInformation->isDefaultRevisionPublished($entity));
+  }
+
+}