Issue #2896722 by Sam152, Wim Leers, tim.plunkett, larowlan, timmillwood:... (65b9f1ff) · Commits · project / drupal

core/modules/content_moderation/content_moderation.routing.yml

+2 −2

Changes for core/modules/content_moderation/content_moderation.routing.yml: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		content_moderation.workflow_type_edit_form:
		path: '/admin/config/workflow/workflows/manage/{workflow}/type/{entity_type_id}'
		defaults:
		_form: '\Drupal\content_moderation\Form\WorkflowTypeEditForm'
		_title_callback: '\Drupal\content_moderation\Form\WorkflowTypeEditForm::getTitle'
		_form: '\Drupal\content_moderation\Form\ContentModerationConfigureEntityTypesForm'
		_title_callback: '\Drupal\content_moderation\Form\ContentModerationConfigureEntityTypesForm::getTitle'
		requirements:
		_permission: 'administer workflows'

core/modules/content_moderation/src/Form/WorkflowTypeEditForm.php→core/modules/content_moderation/src/Form/ContentModerationConfigureEntityTypesForm.php

+1 −1

Changes for core/modules/content_moderation/src/Form/ContentModerationConfigureEntityTypesForm.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		/**
		* The form for editing entity types associated with a workflow.
		*/
		class WorkflowTypeEditForm extends FormBase {
		class ContentModerationConfigureEntityTypesForm extends FormBase {

		/**
		* The entity type manager service.

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

0 → 100644

+136 −0

Changes for core/modules/content_moderation/src/Form/ContentModerationConfigureForm.php: 136 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?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'];
		}
		}

		$form['entity_types_container']['entity_types'][$entity_type->id()] = [
		'type' => [
		'label' => ['#markup' => '<strong>' . $this->t('@bundle types', ['@bundle' => $entity_type->getLabel()]) . '</strong>'],
		'selected' => [
		'#prefix' => '<br/><span id="selected-' . $entity_type->id() . '">',
		'#markup' => !empty($selected_bundles) ? implode(', ', $selected_bundles) : $this->t('none'),
		'#suffix' => '</span>',
		],
		],
		'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' => [
		'aria-label' => $this->t('Select'),
		'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.
		}

		}

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

0 → 100644

+46 −0

Changes for core/modules/content_moderation/src/Form/ContentModerationStateForm.php: 46 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?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;
		}

		}

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

+6 −98

Changes for core/modules/content_moderation/src/Plugin/WorkflowType/ContentModeration.php: 6 added lines, 98 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,19 +2,16 @@

		namespace Drupal\content_moderation\Plugin\WorkflowType;

		use Drupal\Component\Serialization\Json;
		use Drupal\content_moderation\ModerationInformationInterface;
		use Drupal\Core\Access\AccessResult;
		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\Core\Url;
		use Drupal\workflows\Plugin\WorkflowTypeFormBase;
		use Drupal\workflows\Plugin\WorkflowTypeBase;
		use Drupal\workflows\StateInterface;
		use Drupal\workflows\WorkflowInterface;
		use Symfony\Component\DependencyInjection\ContainerInterface;
		@@ -29,9 +26,13 @@
		* "draft",
		* "published",
		* },
		* forms = {
		* "configure" = "\Drupal\content_moderation\Form\ContentModerationConfigureForm",
		* "state" = "\Drupal\content_moderation\Form\ContentModerationStateForm"
		* },
		* )
		*/
		class ContentModeration extends WorkflowTypeFormBase implements ContainerFactoryPluginInterface {
		class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPluginInterface {

		use StringTranslationTrait;

		@@ -144,35 +145,6 @@ public function workflowStateHasData(WorkflowInterface $workflow, StateInterface
		->execute();
		}

		/**
		* {@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;
		}

		/**
		* Gets the entity types the workflow is applied to.
		*
		@@ -375,68 +347,4 @@ public function getInitialState(WorkflowInterface $workflow, $entity = NULL) {
		return parent::getInitialState($workflow);
		}

		/**
		* {@inheritdoc}
		*/
		public function buildConfigurationForm(array $form, FormStateInterface $form_state, WorkflowInterface $workflow = NULL) {
		$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->appliesToEntityTypeAndBundle($entity_type->id(), $bundle_id)) {
		$selected_bundles[$bundle_id] = $bundle['label'];
		}
		}

		$form['entity_types_container']['entity_types'][$entity_type->id()] = [
		'type' => [
		'label' => ['#markup' => '<strong>' . $this->t('@bundle types', ['@bundle' => $entity_type->getLabel()]) . '</strong>'],
		'selected' => [
		'#prefix' => '<br/><span id="selected-' . $entity_type->id() . '">',
		'#markup' => !empty($selected_bundles) ? implode(', ', $selected_bundles) : $this->t('none'),
		'#suffix' => '</span>',
		],
		],
		'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' => [
		'aria-label' => $this->t('Select'),
		'class' => ['use-ajax'],
		'data-dialog-type' => 'modal',
		'data-dialog-options' => Json::encode([
		'width' => 700,
		]),
		],
		],
		],
		],
		];
		}

		return $form;
		}

		}