From a53ba5946db6efd1c5268c2df95693f8ceb411a7 Mon Sep 17 00:00:00 2001
From: Trent Crawford <trent.crawford@liip.ch>
Date: Thu, 2 May 2024 15:14:55 +0200
Subject: [PATCH] Issue 2423093: Re-roll #60 as it was failing silently to
 fully apply.

---
 .../Plugin/Field/FieldWidget/LinkWidget.php   | 25 +++++++++++++++----
 .../EntityAutocompleteController.php          |  9 +++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
index 97015d5bef..d1736c4229 100644
--- a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
+++ b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
@@ -9,8 +9,10 @@
 use Drupal\Core\Field\WidgetBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\link\LinkItemInterface;
+use Drupal\taxonomy\Entity\Term;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
+use Drupal\node\Entity\Node;

 /**
  * Plugin implementation of the 'link' widget.
@@ -98,13 +100,15 @@ protected static function getUriAsDisplayableString($uri) {
    *
    * @param string $string
    *   The user-entered string.
+   * @param string $langcode
+   *   The langcode.
    *
    * @return string
    *   The URI, if a non-empty $uri was passed.
    *
    * @see static::getUriAsDisplayableString()
    */
-  protected static function getUserEnteredStringAsUri($string) {
+  protected static function getUserEnteredStringAsUri($string, $langcode = NULL) {
     // By default, assume the entered string is a URI.
     $uri = trim($string);

@@ -114,6 +118,17 @@ protected static function getUserEnteredStringAsUri($string) {
       // @todo Support entity types other than 'node'. Will be fixed in
       //   https://www.drupal.org/node/2423093.
       $uri = 'entity:node/' . $entity_id;
+      $node = Node::load($entity_id);
+      // On layout builder pages, the langcode is not passed.
+      if (is_null($langcode) && str_contains(\Drupal::routeMatch()->getRouteName(), 'layout_builder') ) {
+        $langcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
+      }
+      if ($node && isset($langcode) && $node->isTranslatable() && $node->hasTranslation($langcode)) {
+        $node = $node->getTranslation($langcode);
+      }
+      if (!$node || (!str_contains($string, $node->label()) && Term::load($entity_id) !== null)) {
+        $uri = 'entity:taxonomy_term/' . $entity_id;
+      }
     }
     // Support linking to nothing.
     elseif (in_array($string, ['<nolink>', '<none>', '<button>'], TRUE)) {
@@ -140,7 +155,7 @@ protected static function getUserEnteredStringAsUri($string) {
    * Disallows saving inaccessible or untrusted URLs.
    */
   public static function validateUriElement($element, FormStateInterface $form_state, $form) {
-    $uri = static::getUserEnteredStringAsUri($element['#value']);
+    $uri = static::getUserEnteredStringAsUri($element['#value'], $form_state->get('langcode'));
     $form_state->setValueForElement($element, $uri);

     // If getUserEnteredStringAsUri() mapped the entered value to an 'internal:'
@@ -216,9 +231,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     // 'url' form element and we have to do the validation ourselves.
     if ($this->supportsInternalLinks()) {
       $element['uri']['#type'] = 'entity_autocomplete';
-      // @todo The user should be able to select an entity type. Will be fixed
-      //   in https://www.drupal.org/node/2423093.
-      $element['uri']['#target_type'] = 'node';
+      // Dirty hack around https://www.drupal.org/node/2423093
+      // @todo: remove when the issue is fixed.
+      $element['uri']['#target_type'] = 'node,taxonomy_term';
       // Disable autocompletion when the first character is '/', '#' or '?'.
       $element['uri']['#attributes']['data-autocomplete-first-character-blacklist'] = '/#?';

diff --git a/core/modules/system/src/Controller/EntityAutocompleteController.php b/core/modules/system/src/Controller/EntityAutocompleteController.php
index 860ab7f846..9287cdd5ba 100644
--- a/core/modules/system/src/Controller/EntityAutocompleteController.php
+++ b/core/modules/system/src/Controller/EntityAutocompleteController.php
@@ -77,6 +77,7 @@ public static function create(ContainerInterface $container) {
    */
   public function handleAutocomplete(Request $request, $target_type, $selection_handler, $selection_settings_key) {
     $matches = [];
+    $target_types = explode(',', $target_type);

     // Get the typed string from the URL, if it exists.
     $input = $request->query->get('q');
@@ -113,8 +114,12 @@ public function handleAutocomplete(Request $request, $target_type, $selection_ha
           }
         }
       }
-
-      $matches = $this->matcher->getMatches($target_type, $selection_handler, $selection_settings, $typed_string);
+      foreach ($target_types as $t_type) {
+        $target_matches = $this->matcher->getMatches($t_type, $selection_handler, $selection_settings, $typed_string);
+        if ($target_matches) {
+          $matches = array_merge($matches, $target_matches);
+        }
+      }
     }

     return new JsonResponse($matches);
--
2.43.2