updated core from 8.4 to 8.5 : bug with login_destination

core/modules/action/action.info.yml

@@ -6,8 +6,8 @@ package: Core
 # core: 8.x
 configure: entity.action.collection
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826

core/modules/action/migrations/action_settings.yml

@@ -3,6 +3,7 @@ label: Action configuration
 migration_tags:
   - Drupal 6
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:

core/modules/action/migrations/d6_action.yml

@@ -2,6 +2,7 @@ id: d6_action
 label: Actions
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: action
 process:
@@ -23,6 +24,12 @@ process:
         imagecache_flush_action: 0
         imagecache_generate_all_action: 0
         imagecache_generate_action: 0
+        comment_publish_action: entity:publish_action:comment
+        comment_unpublish_action: entity:unpublish_action:comment
+        comment_save_action: entity:save_action:comment
+        node_publish_action: entity:publish_action:node
+        node_unpublish_action: entity:unpublish_action:node
+        node_save_action: entity:save_action:node
       bypass: true
     -
       plugin: skip_on_empty

core/modules/action/migrations/d7_action.yml

@@ -2,6 +2,7 @@ id: d7_action
 label: Actions
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: action
 process:
@@ -20,6 +21,12 @@ process:
         system_send_email_action: action_send_email_action
         system_message_action: action_message_action
         system_block_ip_action: 0
+        comment_publish_action: entity:publish_action:comment
+        comment_unpublish_action: entity:unpublish_action:comment
+        comment_save_action: entity:save_action:comment
+        node_publish_action: entity:publish_action:node
+        node_unpublish_action: entity:unpublish_action:node
+        node_save_action: entity:save_action:node
       bypass: true
     -
       plugin: skip_on_empty

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 {
 

core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml

@@ -9,8 +9,8 @@ dependencies:
   - views
   - node
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826

core/modules/action/tests/action_form_ajax_test/action_form_ajax_test.info.yml

@@ -0,0 +1,13 @@
+name: action_form_ajax_test
+type: module
+description: 'module used for testing ajax in action config entity forms.'
+package: Core
+# version: VERSION
+# core: 8.x
+hidden: true
+
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
+core: '8.x'
+project: 'drupal'
+datestamp: 1520457826

core/modules/action/tests/action_form_ajax_test/config/schema/action_form_ajax_test.schema.yml

@@ -0,0 +1,7 @@
+action.configuration.action_form_ajax_test:
+  type: action_configuration_default
+  label: 'action_form_ajax_test action'
+  mapping:
+    party_time:
+      type: string
+      label: 'The time of the party.'

core/modules/action/tests/action_form_ajax_test/src/Plugin/Action/ActionAjaxTest.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\action_form_ajax_test\Plugin\Action;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Action\ConfigurableActionBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Session\AccountInterface;
+
+/**
+ * Plugin used for testing AJAX in action config entity forms.
+ *
+ * @Action(
+ *   id = "action_form_ajax_test",
+ *   label = @Translation("action_form_ajax_test"),
+ *   type = "system"
+ * )
+ */
+class ActionAjaxTest extends ConfigurableActionBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    return [
+      'party_time' => '',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+    $result = AccessResult::allowed();
+    return $return_as_object ? $result : $result->isAllowed();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function execute() {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    $having_a_party = $form_state->getValue('having_a_party', !empty($this->configuration['party_time']));
+    $form['having_a_party'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Are we having a party?'),
+      '#ajax' => [
+        'wrapper' => 'party-container',
+        'callback' => [$this, 'partyCallback'],
+      ],
+      '#default_value' => $having_a_party,
+    ];
+    $form['container'] = [
+      '#type' => 'container',
+      '#prefix' => '<div id="party-container">',
+      '#suffix' => '</div>',
+    ];
+
+    if ($having_a_party) {
+      $form['container']['party_time'] = [
+        '#type' => 'textfield',
+        '#title' => $this->t('Party time'),
+        '#default_value' => $this->configuration['party_time'],
+      ];
+    }
+
+    return $form;
+  }
+
+  /**
+   * Callback for party checkbox.
+   */
+  public function partyCallback(array $form, FormStateInterface $form_state) {
+    return $form['container'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
+    $this->configuration['party_time'] = $form_state->getValue('party_time');
+  }
+
+}

core/modules/action/tests/src/Functional/ConfigurationTest.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\action\Functional;
 
-use Drupal\Component\Utility\Crypt;
 use Drupal\system\Entity\Action;
 use Drupal\Tests\BrowserTestBase;
 
@@ -31,7 +30,7 @@ class ConfigurationTest extends BrowserTestBase {
 
     // Make a POST request to admin/config/system/actions.
     $edit = [];
-    $edit['action'] = Crypt::hashBase64('action_goto_action');
+    $edit['action'] = 'action_goto_action';
     $this->drupalPostForm('admin/config/system/actions', $edit, t('Create'));
     $this->assertResponse(200);
 
@@ -41,17 +40,18 @@ class ConfigurationTest extends BrowserTestBase {
     $edit['label'] = $action_label;
     $edit['id'] = strtolower($action_label);
     $edit['url'] = 'admin';
-    $this->drupalPostForm('admin/config/system/actions/add/' . Crypt::hashBase64('action_goto_action'), $edit, t('Save'));
+    $this->drupalPostForm('admin/config/system/actions/add/action_goto_action', $edit, t('Save'));
     $this->assertResponse(200);
 
+    $action_id = $edit['id'];
+
     // Make sure that the new complex action was saved properly.
     $this->assertText(t('The action has been successfully saved.'), "Make sure we get a confirmation that we've successfully saved the complex action.");
     $this->assertText($action_label, "Make sure the action label appears on the configuration page after we've saved the complex action.");
 
     // Make another POST request to the action edit page.
     $this->clickLink(t('Configure'));
-    preg_match('|admin/config/system/actions/configure/(.+)|', $this->getUrl(), $matches);
-    $aid = $matches[1];
+
     $edit = [];
     $new_action_label = $this->randomMachineName();
     $edit['label'] = $new_action_label;
@@ -73,7 +73,7 @@ class ConfigurationTest extends BrowserTestBase {
     $this->clickLink(t('Delete'));
     $this->assertResponse(200);
     $edit = [];
-    $this->drupalPostForm("admin/config/system/actions/configure/$aid/delete", $edit, t('Delete'));
+    $this->drupalPostForm(NULL, $edit, t('Delete'));
     $this->assertResponse(200);
 
     // Make sure that the action was actually deleted.
@@ -82,7 +82,7 @@ class ConfigurationTest extends BrowserTestBase {
     $this->assertResponse(200);
     $this->assertNoText($new_action_label, "Make sure the action label does not appear on the overview page after we've deleted the action.");
 
-    $action = Action::load($aid);
+    $action = Action::load($action_id);
     $this->assertFalse($action, 'Make sure the action is gone after being deleted.');
   }
 

core/modules/action/tests/src/FunctionalJavascript/ActionFormAjaxTest.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\Tests\action\FunctionalJavascript;
+
+use Drupal\Core\Url;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\system\Entity\Action;
+
+/**
+ * Tests action plugins using Javascript.
+ *
+ * @group action
+ */
+class ActionFormAjaxTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['action', 'action_form_ajax_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $user = $this->drupalCreateUser(['administer actions']);
+    $this->drupalLogin($user);
+  }
+
+  /**
+   * Tests action plugins with AJAX save their configuration.
+   */
+  public function testActionConfigurationWithAjax() {
+    $url = Url::fromRoute('action.admin_add', ['action_id' => 'action_form_ajax_test']);
+    $this->drupalGet($url);
+    $this->assertSession()->statusCodeEquals(200);
+    $page = $this->getSession()->getPage();
+
+    $id = 'test_plugin';
+    $page->find('css', '[name="id"]')
+      ->setValue($id);
+
+    $page->find('css', '[name="having_a_party"]')
+      ->check();
+    $this->assertSession()->waitForElement('css', '[name="party_time"]');
+
+    $party_time = 'Evening';
+    $page->find('css', '[name="party_time"]')
+      ->setValue($party_time);
+
+    $page->find('css', '[value="Save"]')
+      ->click();
+
+    $url = Url::fromRoute('entity.action.collection');
+    $this->assertSession()->pageTextContains('The action has been successfully saved.');
+    $this->assertSession()->addressEquals($url);
+    $this->assertSession()->statusCodeEquals(200);
+
+    // Check storage.
+    $instance = Action::load($id);
+    $configuration = $instance->getPlugin()->getConfiguration();
+    $this->assertEquals(['party_time' => $party_time], $configuration);
+
+    // Configuration should be shown in edit form.
+    $this->drupalGet($instance->toUrl('edit-form'));
+    $this->assertSession()->checkboxChecked('having_a_party');
+    $this->assertSession()->fieldValueEquals('party_time', $party_time);
+  }
+
+}

core/modules/action/tests/src/Kernel/Plugin/migrate/source/ActionTest.php

@@ -15,7 +15,7 @@ class ActionTest extends MigrateSqlSourceTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['action', 'migrate_drupal'];
+  public static $modules = ['action', 'migrate_drupal', 'system'];
 
   /**
    * {@inheritdoc}