Merge pull request #119 from City-of-Helsinki/PLATTA-4940-LinkProcess…

…or-fix PLATTA-4940 use twig for link title only when needed
City-of-Helsinki · Aug 14, 2023 · ae834a7 · ae834a7
2 parents 4c3d285 + 94615cb
commit ae834a7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/Link/LinkProcessor.php b/src/Link/LinkProcessor.php
@@ -5,6 +5,7 @@
 namespace Drupal\helfi_api_base\Link;
 
 use Drupal\Core\Render\Element\Link;
+use Drupal\Core\Render\Markup;
 use Drupal\Core\Url;
 
 /**
@@ -16,27 +17,39 @@ final class LinkProcessor extends Link {
    * {@inheritdoc}
    */
   public static function preRenderLink($element) : array {
+    $useTemplate = FALSE;
+
     if (isset($element['#url']) && $element['#url'] instanceof Url) {
+      $url = $element['#url'];
+
+      if ($element['#title'] instanceof Markup) {
+        $useTemplate = TRUE;
+      }
+
       /** @var \Drupal\helfi_api_base\Link\InternalDomainResolver $resolver */
       $resolver = \Drupal::service('helfi_api_base.internal_domain_resolver');
 
-      $element['#title'] = [
-        '#theme' => 'helfi_link',
-        '#url' => $element['#url'],
-        '#title' => $element['#title'],
-      ];
-
       // We can't set URI's 'external' property to FALSE, because it will
       // break the URL validation.
-      if ($resolver->isExternal($element['#url'])) {
+      if ($resolver->isExternal($url)) {
         $element['#attributes']['data-is-external'] = 'true';
 
-        if ($scheme = $resolver->getProtocol($element['#url'])) {
+        if ($scheme = $resolver->getProtocol($url)) {
           $element['#attributes']['data-protocol'] = $scheme;
         }
+        $useTemplate = TRUE;
       }
+    }
+
+    if ($useTemplate) {
+      $element['#title'] = [
+        '#theme' => 'helfi_link',
+        '#url' => $element['#url'],
+        '#title' => $element['#title'],
+      ];
       $element['#title']['#attributes'] = $element['#attributes'] ?? [];
     }
+
     return parent::preRenderLink($element);
   }
 

diff --git a/templates/helfi-link.html.twig b/templates/helfi-link.html.twig
@@ -1 +1,5 @@
+{#
+  This twig is called only for certain links
+  see conditions in Drupal\helfi_api_base\Link\LinkProcessor::preRenderLink
+#}
 {{ title }}