Unverified Commit b2205aff authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2762131 by tstoeckler, mohit_aghera, kristiaanvandeneynde,...

Issue #2762131 by tstoeckler, mohit_aghera, kristiaanvandeneynde, vsujeetkumar, ravi.shankar, alexpott, dawehner, bojanz, larowlan, smustgrave, idebr: Generalize MenuLinkAdd so all local actions can use it
parent 5363b947
Loading
Loading
Loading
Loading
Loading
+48 −0
Original line number Diff line number Diff line
<?php

namespace Drupal\Core\Menu;

use Drupal\Core\Routing\RedirectDestinationInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Routing\RouteProviderInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;

/**
 * Modifies the local action to add a destination.
 */
class LocalActionWithDestination extends LocalActionDefault {

  public function __construct(
    array $configuration,
    $plugin_id,
    $plugin_definition,
    RouteProviderInterface $route_provider,
    protected RedirectDestinationInterface $redirectDestination,
  ) {
    parent::__construct($configuration, $plugin_id, $plugin_definition, $route_provider);
  }

  /**
   * {@inheritdoc}
   */
  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
    return new static(
      $configuration,
      $plugin_id,
      $plugin_definition,
      $container->get('router.route_provider'),
      $container->get('redirect.destination')
    );
  }

  /**
   * {@inheritdoc}
   */
  public function getOptions(RouteMatchInterface $route_match) {
    $options = parent::getOptions($route_match);
    // Append the current path or destination to the query string.
    $options['query']['destination'] = $this->redirectDestination->get();
    return $options;
  }

}
+1 −1
Original line number Diff line number Diff line
entity.menu.add_link_form:
  route_name: entity.menu.add_link_form
  title: 'Add link'
  class: \Drupal\menu_ui\Plugin\Menu\LocalAction\MenuLinkAdd
  class: \Drupal\Core\Menu\LocalActionWithDestination
  appears_on:
    - entity.menu.edit_form

+10 −51
Original line number Diff line number Diff line
@@ -2,65 +2,24 @@

namespace Drupal\menu_ui\Plugin\Menu\LocalAction;

use Drupal\Core\Menu\LocalActionDefault;
use Drupal\Core\Menu\LocalActionWithDestination;
use Drupal\Core\Routing\RedirectDestinationInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Routing\RouteProviderInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;

/**
 * Modifies the 'Add link' local action to add a destination.
 */
class MenuLinkAdd extends LocalActionDefault {

  /**
   * The redirect destination.
 *
   * @var \Drupal\Core\Routing\RedirectDestinationInterface
   */
  private $redirectDestination;

  /**
   * Constructs a MenuLinkAdd object.
 * @deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use
 *   \Drupal\Core\Menu\LocalActionWithDestination instead.
 *
   * @param array $configuration
   *   A configuration array containing information about the plugin instance.
   * @param string $plugin_id
   *   The plugin ID for the plugin instance.
   * @param mixed $plugin_definition
   *   The plugin implementation definition.
   * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
   *   The route provider to load routes by name.
   * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination
   *   The redirect destination.
 * @see https://www.drupal.org/node/3490245
 */
  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, RedirectDestinationInterface $redirect_destination) {
    parent::__construct($configuration, $plugin_id, $plugin_definition, $route_provider);
class MenuLinkAdd extends LocalActionWithDestination {

    $this->redirectDestination = $redirect_destination;
  }
  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, RedirectDestinationInterface $redirectDestination) {
    parent::__construct($configuration, $plugin_id, $plugin_definition, $route_provider, $redirectDestination);

  /**
   * {@inheritdoc}
   */
  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
    return new static(
      $configuration,
      $plugin_id,
      $plugin_definition,
      $container->get('router.route_provider'),
      $container->get('redirect.destination')
    );
  }

  /**
   * {@inheritdoc}
   */
  public function getOptions(RouteMatchInterface $route_match) {
    $options = parent::getOptions($route_match);
    // Append the current path as destination to the query string.
    $options['query']['destination'] = $this->redirectDestination->get();
    return $options;
    @trigger_error(__CLASS__ . ' is deprecated in drupal:11.2.0 and is removed from drupal:12.0.0. Use \Drupal\Core\Menu\LocalActionWithDestination instead. See https://www.drupal.org/node/3490245', E_USER_DEPRECATED);
  }

}
+4 −0
Original line number Diff line number Diff line
name: 'Tests MenuLinkAdd class'
type: module
package: Testing
version: VERSION
+6 −0
Original line number Diff line number Diff line
entity.menu.add_link_form_deprecated:
  route_name: entity.menu.add_link_form
  title: 'Add link (deprecated)'
  class: \Drupal\menu_ui\Plugin\Menu\LocalAction\MenuLinkAdd
  appears_on:
    - entity.menu.edit_form
Loading