OPENEUROPA-1915: Integrate entity_versions module in oe_editorial #30
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nagyad
changed the title
upchuk
requested changes
Jun 27, 2019
| @@ -151,7 +151,10 @@ function oe_editorial_corporate_workflow_form_content_moderation_entity_moderati | |||
| function _oe_editorial_corporate_workflow_moderation_submit(array &$form, FormStateInterface &$form_state): void { | |||
| /** @var \Drupal\oe_editorial_corporate_workflow\Services\ShortcutRevisionHandler $shortcut_handler */ | |||
| $shortcut_handler = \Drupal::service('oe_editorial_corporate_workflow.shortcut_transition_handler'); | |||
| $shortcut_handler->createShortcutRevisions($form_state->getValue('new_state'), $form_state->get('entity'), $form_state->getValue('revision_log')); | |||
| $latest_entity = $shortcut_handler->createShortcutRevisions($form_state->getValue('new_state'), $form_state->get('entity'), $form_state->getValue('revision_log')); | |||
There was a problem hiding this comment.
Let's call this $latest_revision
| $shortcut_handler->createShortcutRevisions($form_state->getValue('new_state'), $form_state->get('entity'), $form_state->getValue('revision_log')); | ||
| $latest_entity = $shortcut_handler->createShortcutRevisions($form_state->getValue('new_state'), $form_state->get('entity'), $form_state->getValue('revision_log')); | ||
|
|
||
| // Make sure we pass along the updated entity. |
There was a problem hiding this comment.
When using the shortcut, we are creating revisions for all of the transitions we are skipping. The last transition in the chain is handled by core so we need to make sure that its submit handler receives the latest revision that we created. Otherwise it may use a revision with stale data.
| */ | ||
| public function createShortcutRevisions(string $target_state, ContentEntityInterface $entity, string $revision_message = NULL); | ||
| public function createShortcutRevisions(string $target_state, ContentEntityInterface $entity, string $revision_message = NULL): RevisionableInterface; |
There was a problem hiding this comment.
EntityInterface not RevisionableInterface.
| ->addEntityVersionFieldToWorkflowBundles('oe_corporate_workflow', $default_values); | ||
| } | ||
|
|
||
| /** |
There was a problem hiding this comment.
This post update is not needed.
| // Get bundles associated with the corporate workflow and assign the | ||
| // entity version field to them. | ||
| $workflow_name = 'workflows.workflow.' . $workflow_id; | ||
| $corporate_workflow = $this->configFactory->getEditable($workflow_name); |
There was a problem hiding this comment.
We don't know it's the corporate workflow.
| 'entity_type' => 'node', | ||
| 'field_name' => 'version', | ||
| 'bundle' => $bundle, | ||
| 'label' => 'Version', |
tests/Behat/FeatureContext.php
Outdated
| $node = reset($nodes); | ||
|
|
||
| // Load the latest revision. | ||
| $entity_type = $node->getEntityType(); |
There was a problem hiding this comment.
Le'ts keep this the way it was and load the latest revision in theNodeShouldHaveTheFollowingVersion
| | major | 1 | | ||
| | minor | 0 | | ||
| | patch | 0 | | ||
| # Set to Published nad back to Draft. |
| $this->container->get('oe_editorial_entity_version.entity_version_installer')->addEntityVersionFieldToWorkflowBundles('oe_corporate_workflow', $default_value); | ||
| /** @var \Drupal\field\Entity\FieldConfig $field_config */ | ||
| $field_config = $this->container->get('entity_type.manager')->getStorage('field_config')->load('node.test_node_type.version'); | ||
| $this->assertNotEmpty($field_config); |
upchuk
previously approved these changes
Jun 28, 2019
upchuk
approved these changes
Jul 2, 2019
imanoleguskiza
approved these changes
Jul 2, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Attention! The https://github.com/openeuropa/entity_version/pull/7/files PR has to be merged at first!