diff --git a/diff.services.yml b/diff.services.yml index b915467..16ff140 100755 --- a/diff.services.yml +++ b/diff.services.yml @@ -24,7 +24,7 @@ services: diff.entity_comparison: class: Drupal\diff\DiffEntityComparison - arguments: ['@config.factory', '@diff.diff.formatter','@plugin.manager.field.field_type', '@diff.entity_parser'] + arguments: ['@config.factory', '@diff.diff.formatter','@plugin.manager.field.field_type', '@diff.entity_parser', '@plugin.manager.diff.builder'] diff.html_diff: class: HtmlDiffAdvanced \ No newline at end of file diff --git a/src/DiffEntityComparison.php b/src/DiffEntityComparison.php index 3a0cd77..5b5dee6 100644 --- a/src/DiffEntityComparison.php +++ b/src/DiffEntityComparison.php @@ -6,8 +6,8 @@ use Drupal\Core\Config\ConfigFactory; use Drupal\Component\Plugin\PluginManagerInterface; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Component\Diff\Diff; +use Drupal\Core\Entity\RevisionLogInterface; use Drupal\Core\Render\Element; -use Drupal\Core\Mail\MailFormatHelper; use Drupal\Component\Utility\Xss; /** @@ -47,6 +47,13 @@ class DiffEntityComparison { protected $entityParser; /** + * The field diff plugin manager service. + * + * @var \Drupal\diff\DiffBuilderManager + */ + protected $diffBuilderManager; + + /** * Constructs a DiffEntityComparison object. * * @param ConfigFactory $config_factory @@ -57,13 +64,16 @@ class DiffEntityComparison { * The Plugin manager service. * @param DiffEntityParser $entity_parser * The diff field builder plugin manager. + * @param DiffBuilderManager $diff_builder_manager + * The diff builder manager. */ - public function __construct(ConfigFactory $config_factory, DiffFormatter $diff_formatter, PluginManagerInterface $plugin_manager, DiffEntityParser $entity_parser) { + public function __construct(ConfigFactory $config_factory, DiffFormatter $diff_formatter, PluginManagerInterface $plugin_manager, DiffEntityParser $entity_parser, DiffBuilderManager $diff_builder_manager) { $this->configFactory = $config_factory; $this->pluginsConfig = $this->configFactory->get('diff.plugins'); $this->diffFormatter = $diff_formatter; $this->fieldTypeDefinitions = $plugin_manager->getDefinitions(); $this->entityParser = $entity_parser; + $this->diffBuilderManager = $diff_builder_manager; } /** @@ -243,4 +253,56 @@ class DiffEntityComparison { } } + /** + * Gets the revision description of the revision. + * + * @param \Drupal\Core\Entity\ContentEntityInterface $revision + * The current revision. + * @param $previous_revision_id + * The previous revision. + * + * @return string + * The revision log message. + */ + public function getRevisionDescription($revision, $previous_revision_id) { + if ($revision instanceof RevisionLogInterface) { + $revision_summary = Xss::filter($revision->getRevisionLogMessage()); + if ($revision_summary == '') { + $revision_summary = $this->summary($revision, $previous_revision_id); + } + } + else { + $revision_summary = $this->summary($revision, $previous_revision_id); + } + return $revision_summary; + } + + /** + * Creates an log message based on the changes of entity fields. + * + * @param $revision + * The current revision. + * @param $previous_revision_id + * The previous revision id. + * + * @return string + * The revision log message. + */ + protected function summary($revision, $previous_revision_id) { + $storage = \Drupal::entityTypeManager() + ->getStorage($revision->getEntityTypeId()); + $previous_revision = $storage->loadRevision($previous_revision_id); + $summary = 'Changes on: '; + foreach ($previous_revision as $key => $value) { + if ($previous_revision->get($key) + ->getValue() != $revision->get($key)->getValue() + && $this->diffBuilderManager->getSelectedPluginForFieldDefinition($value->getFieldDefinition()) + ) { + $summary .= $summary != 'Changes on: ' ? ', ' : ''; + $summary .= $value->getFieldDefinition()->getLabel(); + } + } + return $summary; + } + } diff --git a/src/Form/RevisionOverviewForm.php b/src/Form/RevisionOverviewForm.php index fdef4f3..f313617 100755 --- a/src/Form/RevisionOverviewForm.php +++ b/src/Form/RevisionOverviewForm.php @@ -3,6 +3,7 @@ namespace Drupal\diff\Form; use Drupal\Core\Language\LanguageManagerInterface; +use Drupal\diff\DiffEntityComparison; use Drupal\diff\DiffLayoutManager; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Entity\EntityManagerInterface; @@ -67,6 +68,11 @@ class RevisionOverviewForm extends FormBase { protected $diffLayoutManager; /** + * The diff entity comparison service. + */ + protected $entityComparison; + + /** * Constructs a RevisionOverviewForm object. * * @param \Drupal\Core\Entity\EntityManagerInterface $entityManager @@ -81,8 +87,10 @@ class RevisionOverviewForm extends FormBase { * The language manager. * @param DiffLayoutManager $diff_layout_manager * DiffLayoutManager service. + * @param \Drupal\diff\DiffEntityComparison $entity_comparison + * The diff entity comparison service. */ - public function __construct(EntityManagerInterface $entityManager, AccountInterface $currentUser, DateFormatter $date, RendererInterface $renderer, LanguageManagerInterface $language_manager, DiffLayoutManager $diff_layout_manager) { + public function __construct(EntityManagerInterface $entityManager, AccountInterface $currentUser, DateFormatter $date, RendererInterface $renderer, LanguageManagerInterface $language_manager, DiffLayoutManager $diff_layout_manager, DiffEntityComparison $entity_comparison) { $this->entityManager = $entityManager; $this->currentUser = $currentUser; $this->date = $date; @@ -90,6 +98,7 @@ class RevisionOverviewForm extends FormBase { $this->languageManager = $language_manager; $this->config = $this->config('diff.settings'); $this->diffLayoutManager = $diff_layout_manager; + $this->entityComparison = $entity_comparison; } /** @@ -102,7 +111,8 @@ class RevisionOverviewForm extends FormBase { $container->get('date.formatter'), $container->get('renderer'), $container->get('language_manager'), - $container->get('plugin.manager.diff.layout') + $container->get('plugin.manager.diff.layout'), + $container->get('diff.entity_comparison') ); } @@ -145,6 +155,7 @@ class RevisionOverviewForm extends FormBase { $table_header = array( 'revision' => $this->t('Revision'), + 'summary' => $this->t('Summary'), 'operations' => $this->t('Operations'), ); @@ -179,7 +190,7 @@ class RevisionOverviewForm extends FormBase { $latest_revision = empty($page); // Add rows to the table. - foreach ($vids as $vid) { + foreach ($vids as $key => $vid) { if ($revision = $node_storage->loadRevision($vid)) { if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) { $username = array( @@ -194,7 +205,7 @@ class RevisionOverviewForm extends FormBase { else { $link = $node->link($revision_date); } - + $key - 1 > 0 ? $old_key = $key - 1 : $old_key = 0; // Default revision. if ($latest_revision) { $row = array( @@ -207,6 +218,10 @@ class RevisionOverviewForm extends FormBase { 'message' => ['#markup' => $revision->revision_log->value, '#allowed_tags' => Xss::getHtmlTagList()], ], ), + 'summary' => [ + '#type' => 'markup', + '#markup' => $this->entityComparison->getRevisionDescription($revision, $vids[$old_key]), + ], ); // Allow comparisons only if there are 2 or more revisions. if ($revision_count > 1) { @@ -272,6 +287,10 @@ class RevisionOverviewForm extends FormBase { 'message' => ['#markup' => $revision->revision_log->value, '#allowed_tags' => Xss::getHtmlTagList()], ], ), + 'summary' => [ + '#type' => 'markup', + '#markup' => $this->entityComparison->getRevisionDescription($revision, $vids[$old_key]), + ], 'select_column_one' => array( '#type' => 'radio', '#title_display' => 'invisible',