Use <frontpage> route for frontpage language switch links. (#663)

Author: pmelab

modules/graphql_core/src/Plugin/GraphQL/Fields/LanguageSwitch/LanguageSwitchLinks.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\graphql_core\Plugin\GraphQL\Fields\LanguageSwitch;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -45,6 +46,13 @@ class LanguageSwitchLinks extends FieldPluginBase implements ContainerFactoryPlu
    */
   protected $subRequestBuffer;
 
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
   /**
    * {@inheritdoc}
    */
@@ -54,7 +62,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $container->get('language_manager'),
-      $container->get('graphql.buffer.subrequest')
+      $container->get('graphql.buffer.subrequest'),
+      $container->get('config.factory')
     );
   }
 
@@ -66,11 +75,13 @@ public function __construct(
     $pluginId,
     $pluginDefinition,
     LanguageManagerInterface $languageManager,
-    SubRequestBuffer $subRequestBuffer
+    SubRequestBuffer $subRequestBuffer,
+    ConfigFactoryInterface $configFactory
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->languageManager = $languageManager;
     $this->subRequestBuffer = $subRequestBuffer;
+    $this->configFactory = $configFactory;
   }
 
   /**
@@ -79,7 +90,14 @@ public function __construct(
   protected function resolveValues($value, array $args, ResolveContext $context, ResolveInfo $info) {
     if ($value instanceof Url) {
 
+      // Use the <front> route if the requested url is the frontpage.
+      $frontpage = $this->configFactory->get('system.site')->get('page.front');
+      if ('/' . $value->getInternalPath() === $frontpage) {
+        $value = Url::fromRoute('<front>');
+      }
+
       $links = $this->languageManager->getLanguageSwitchLinks(LanguageInterface::TYPE_URL, $value);
+
       $current = $this->languageManager->getLanguage($args['language']);
       if (!$current) {
         $current = $this->languageManager->getDefaultLanguage();

modules/graphql_core/tests/src/Kernel/Languages/LanguageTest.php

@@ -116,7 +116,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'en',
             ],
             'url' => [
-              'path' => '/en/user/login',
+              'path' => '/en',
             ],
             'title' => 'English',
             'active' => TRUE,
@@ -126,7 +126,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'fr',
             ],
             'url' => [
-              'path' => '/fr/user/login',
+              'path' => '/fr',
             ],
             'title' => NULL,
             'active' => FALSE,
@@ -136,7 +136,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'es',
             ],
             'url' => [
-              'path' => '/es/user/login',
+              'path' => '/es',
             ],
             'title' => NULL,
             'active' => FALSE,
@@ -146,7 +146,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'pt-br',
             ],
             'url' => [
-              'path' => '/user/login',
+              'path' => '/',
             ],
             'title' => NULL,
             'active' => FALSE,