OPENEUROPA-1770: Shortcuts on workflow block on node view page #23
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
Member
nagyad
commented
May 6, 2019
•
nagyad
commented
- Override StateTransitionValidation::getValidTransitions() method in order to provide extended options with permission check.
- Provide form_alter() for the moderation form in order to make sure that the next state is selected by default.
- Removed access for moderation state dropdown in node form if there is only a Draft state present.
- Add service to save revisions for all transitions programatically when shortcuts are used.
nagyad
force-pushed
the
OPENEUROPA-1770
branch
3 times, most recently
from
0ba592e
to
a0b01fe
Compare
upchuk
requested changes
May 10, 2019
modules/oe_editorial_corporate_workflow/oe_editorial_corporate_workflow.module
Outdated
Show resolved
Hide resolved
modules/oe_editorial_corporate_workflow/src/CorporateWorkflowStateTransitionValidation.php
Outdated
Show resolved
Hide resolved
modules/oe_editorial_corporate_workflow/src/CorporateWorkflowStateTransitionValidation.php
Outdated
Show resolved
Hide resolved
upchuk
previously approved these changes
May 10, 2019
hernani
reviewed
May 14, 2019
modules/oe_editorial_corporate_workflow/oe_editorial_corporate_workflow.module
Outdated
Show resolved
Hide resolved
…orkflow in forms.
hernani
reviewed
May 21, 2019
modules/oe_editorial_corporate_workflow/config/install/user.role.oe_validator.yml
Show resolved
Hide resolved
hernani
reviewed
May 21, 2019
modules/oe_editorial_corporate_workflow/oe_editorial_corporate_workflow.module
Outdated
Show resolved
Hide resolved
hernani
reviewed
May 21, 2019
modules/oe_editorial_corporate_workflow/oe_editorial_corporate_workflow.module
Show resolved
Hide resolved
hernani
reviewed
May 21, 2019
modules/oe_editorial_corporate_workflow/oe_editorial_corporate_workflow.module
Outdated
Show resolved
Hide resolved
hernani
reviewed
May 21, 2019
upchuk
requested changes
May 23, 2019
| /** | ||
| * Provides an interface for shortcut handler service. | ||
| */ | ||
| interface ShortcutTransitionHandlerInterface { |
There was a problem hiding this comment.
Let's call it ShortcutRevisionHandlerInterface
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function handleShortcutTransitions(array $form, FormStateInterface $form_state): void { |
There was a problem hiding this comment.
Why are we tying this to a form? The implementation you have simply needs an entity (whatever kind of content entity) and a state to make the revisions. So that's what should be the interface.
| protected $currentUser; | ||
|
|
||
| /** | ||
| * Entity type manager to get entity storage. |
| protected $time; | ||
|
|
||
| /** | ||
| * Constructs a new StateTransitionValidation. |
| * @param \Drupal\Core\Form\FormStateInterface $form_state | ||
| * The form state. | ||
| */ | ||
| public function handleShortcutTransitions(array $form, FormStateInterface $form_state); |
There was a problem hiding this comment.
Let's call it createShortcutRevisions
| } | ||
|
|
||
| /** | ||
| * Function to save state transitions and revisions to the target state. |
There was a problem hiding this comment.
Small comment is enough here:
Recursively saves the revisions between two states.
| * The form state of the form we are submitting. | ||
| */ | ||
| protected function saveTransitionRevisions($current_state, $target_state, WorkflowTypeInterface $workflow_plugin, RevisionableInterface $entity, FormStateInterface $form_state): void { | ||
| // We need to stop before the last transition, since the following |
There was a problem hiding this comment.
We need to stop before the last transition because the creation of that revision is handled by core.
|
|
||
| /** | ||
| * Provides an interface for shortcut handler service. | ||
| */ |
There was a problem hiding this comment.
Provides an interface for shortcut revision handlers.
These are used in the form responsible for moderating content, provided by Drupal core.
| $entity->save(); | ||
|
|
||
| // We need to repeat this operation until we reach the target state. | ||
| // Once we see that the target state is the next the following form submit |
There was a problem hiding this comment.
Just this is enough:
We need to repeat this operation until we reach the target state.
| * @param string $current_state | ||
| * The current state of the entity. | ||
| * @param string $target_state | ||
| * The target state selected from the moderation form. |
hernani
reviewed
May 23, 2019
| } | ||
|
|
||
| /** @var \Drupal\node\NodeInterface $node */ | ||
| $node = \Drupal::routeMatch()->getParameter('node'); |
There was a problem hiding this comment.
Can we get it from form_state just for consistency?
hernani
approved these changes
May 24, 2019
upchuk
approved these changes
May 27, 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.