updated core from 8.4 to 8.5 : bug with login_destination

core/modules/action/src/ActionAddForm.php

@@ -2,67 +2,28 @@
 
 namespace Drupal\action;
 
-use Drupal\Component\Utility\Crypt;
-use Drupal\Core\Action\ActionManager;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for action add forms.
+ *
+ * @internal
  */
 class ActionAddForm extends ActionFormBase {
 
-  /**
-   * The action manager.
-   *
-   * @var \Drupal\Core\Action\ActionManager
-   */
-  protected $actionManager;
-
-  /**
-   * Constructs a new ActionAddForm.
-   *
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The action storage.
-   * @param \Drupal\Core\Action\ActionManager $action_manager
-   *   The action plugin manager.
-   */
-  public function __construct(EntityStorageInterface $storage, ActionManager $action_manager) {
-    parent::__construct($storage);
-
-    $this->actionManager = $action_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.manager')->getStorage('action'),
-      $container->get('plugin.manager.action')
-    );
-  }
-
   /**
    * {@inheritdoc}
    *
    * @param string $action_id
-   *   The hashed version of the action ID.
+   *   The action ID.
    */
   public function buildForm(array $form, FormStateInterface $form_state, $action_id = NULL) {
-    // In \Drupal\action\Form\ActionAdminManageForm::buildForm() the action
-    // are hashed. Here we have to decrypt it to find the desired action ID.
-    foreach ($this->actionManager->getDefinitions() as $id => $definition) {
-      $key = Crypt::hashBase64($id);
-      if ($key === $action_id) {
-        $this->entity->setPlugin($id);
-        // Derive the label and type from the action definition.
-        $this->entity->set('label', $definition['label']);
-        $this->entity->set('type', $definition['type']);
-        break;
-      }
-    }
+    $this->entity->setPlugin($action_id);
+
+    // Derive the label and type from the action definition.
+    $definition = $this->entity->getPluginDefinition();
+    $this->entity->set('label', $definition['label']);
+    $this->entity->set('type', $definition['type']);
 
     return parent::buildForm($form, $form_state);
   }

core/modules/action/src/ActionEditForm.php

@@ -4,6 +4,8 @@ namespace Drupal\action;
 
 /**
  * Provides a form for action edit forms.
+ *
+ * @internal
  */
 class ActionEditForm extends ActionFormBase {
 

core/modules/action/src/ActionFormBase.php

@@ -13,13 +13,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 abstract class ActionFormBase extends EntityForm {
 
-  /**
-   * The action plugin being configured.
-   *
-   * @var \Drupal\Core\Action\ActionInterface
-   */
-  protected $plugin;
-
   /**
    * The action storage.
    *
@@ -27,6 +20,13 @@ abstract class ActionFormBase extends EntityForm {
    */
   protected $storage;
 
+  /**
+   * The action entity.
+   *
+   * @var \Drupal\system\ActionConfigEntityInterface
+   */
+  protected $entity;
+
   /**
    * Constructs a new action form.
    *
@@ -46,14 +46,6 @@ abstract class ActionFormBase extends EntityForm {
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $this->plugin = $this->entity->getPlugin();
-    return parent::buildForm($form, $form_state);
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -85,8 +77,8 @@ abstract class ActionFormBase extends EntityForm {
       '#value' => $this->entity->getType(),
     ];
 
-    if ($this->plugin instanceof PluginFormInterface) {
-      $form += $this->plugin->buildConfigurationForm($form, $form_state);
+    if ($plugin = $this->getPlugin()) {
+      $form += $plugin->buildConfigurationForm($form, $form_state);
     }
 
     return parent::form($form, $form_state);
@@ -96,7 +88,7 @@ abstract class ActionFormBase extends EntityForm {
    * Determines if the action already exists.
    *
    * @param string $id
-   *   The action ID
+   *   The action ID.
    *
    * @return bool
    *   TRUE if the action exists, FALSE otherwise.
@@ -120,9 +112,8 @@ abstract class ActionFormBase extends EntityForm {
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     parent::validateForm($form, $form_state);
-
-    if ($this->plugin instanceof PluginFormInterface) {
-      $this->plugin->validateConfigurationForm($form, $form_state);
+    if ($plugin = $this->getPlugin()) {
+      $plugin->validateConfigurationForm($form, $form_state);
     }
   }
 
@@ -131,9 +122,8 @@ abstract class ActionFormBase extends EntityForm {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-
-    if ($this->plugin instanceof PluginFormInterface) {
-      $this->plugin->submitConfigurationForm($form, $form_state);
+    if ($plugin = $this->getPlugin()) {
+      $plugin->submitConfigurationForm($form, $form_state);
     }
   }
 
@@ -147,4 +137,17 @@ abstract class ActionFormBase extends EntityForm {
     $form_state->setRedirect('entity.action.collection');
   }
 
+  /**
+   * Gets the action plugin while ensuring it implements configuration form.
+   *
+   * @return \Drupal\Core\Action\ActionInterface|\Drupal\Core\Plugin\PluginFormInterface|null
+   *   The action plugin, or NULL if it does not implement configuration forms.
+   */
+  protected function getPlugin() {
+    if ($this->entity->getPlugin() instanceof PluginFormInterface) {
+      return $this->entity->getPlugin();
+    }
+    return NULL;
+  }
+
 }

core/modules/action/src/ActionListBuilder.php

@@ -108,12 +108,12 @@ class ActionListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function render() {
+    $build['action_admin_manage_form'] = \Drupal::formBuilder()->getForm('Drupal\action\Form\ActionAdminManageForm');
     $build['action_header']['#markup'] = '<h3>' . $this->t('Available actions:') . '</h3>';
     $build['action_table'] = parent::render();
     if (!$this->hasConfigurableActions) {
       unset($build['action_table']['table']['#header']['operations']);
     }
-    $build['action_admin_manage_form'] = \Drupal::formBuilder()->getForm('Drupal\action\Form\ActionAdminManageForm');
     return $build;
   }
 

core/modules/action/src/Form/ActionAdminManageForm.php

@@ -3,13 +3,14 @@
 namespace Drupal\action\Form;
 
 use Drupal\Core\Form\FormBase;
-use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Action\ActionManager;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a configuration form for configurable actions.
+ *
+ * @internal
  */
 class ActionAdminManageForm extends FormBase {
 
@@ -53,10 +54,10 @@ class ActionAdminManageForm extends FormBase {
     $actions = [];
     foreach ($this->manager->getDefinitions() as $id => $definition) {
       if (is_subclass_of($definition['class'], '\Drupal\Core\Plugin\PluginFormInterface')) {
-        $key = Crypt::hashBase64($id);
-        $actions[$key] = $definition['label'] . '...';
+        $actions[$id] = $definition['label'];
       }
     }
+    asort($actions);
     $form['parent'] = [
       '#type' => 'details',
       '#title' => $this->t('Create an advanced action'),
@@ -68,7 +69,7 @@ class ActionAdminManageForm extends FormBase {
       '#title' => $this->t('Action'),
       '#title_display' => 'invisible',
       '#options' => $actions,
-      '#empty_option' => $this->t('Choose an advanced action'),
+      '#empty_option' => $this->t('- Select -'),
     ];
     $form['parent']['actions'] = [
       '#type' => 'actions'

core/modules/action/src/Form/ActionDeleteForm.php

@@ -7,6 +7,8 @@ use Drupal\Core\Url;
 
 /**
  * Builds a form to delete an action.
+ *
+ * @internal
  */
 class ActionDeleteForm extends EntityDeleteForm {