fix: Handle URLs with "&" correctly

Author: marienfressinaud

src/assets/javascripts/controllers/link_suggestion_controller.js

@@ -2,13 +2,17 @@ import { Controller } from '@hotwired/stimulus';
 
 export default class extends Controller {
     static get targets () {
-        return ['input', 'message', 'suggestion'];
+        return ['input', 'message'];
+    }
+
+    static values = {
+        url: String,
     }
 
     change (event) {
         event.preventDefault();
 
-        this.inputTarget.value = this.suggestionTarget.innerHTML;
+        this.inputTarget.value = this.urlValue;
         this.messageTarget.hidden = true;
         this.inputTarget.focus();
     }

src/views/collections/shares/index.phtml

@@ -8,9 +8,9 @@
 
 <?= $this->include('collections/shares/_index.phtml', [
     'collection' => $collection,
-    'type' => $type,
-    'user_id' => $user_id,
-    'from' => $from,
+    'type' => $this->safe('type'),
+    'user_id' => $this->safe('user_id'),
+    'from' => $this->safe('from'),
     'errors' => $errors,
-    'error' => $error,
+    'error' => $this->safe('error'),
 ]); ?>

src/views/collections/shares/index.turbo_stream.phtml

@@ -2,11 +2,11 @@
     <template>
         <?= $this->include('collections/shares/_index.phtml', [
             'collection' => $collection,
-            'type' => $type,
-            'user_id' => $user_id,
-            'from' => $from,
+            'type' => $this->safe('type'),
+            'user_id' => $this->safe('user_id'),
+            'from' => $this->safe('from'),
             'errors' => $errors,
-            'error' => $error,
+            'error' => $this->safe('error'),
         ]); ?>
     </template>
 </turbo-stream>

src/views/feeds/new.phtml

@@ -8,8 +8,8 @@
 ?>
 
 <?= $this->include('feeds/_new.phtml', [
-    'url' => $url,
-    'from' => $from,
+    'url' => $this->safe('url'),
+    'from' => $this->safe('from'),
     'errors' => $errors,
-    'error' => $error,
+    'error' => $this->safe('error'),
 ]); ?>

src/views/feeds/new.turbo_stream.phtml

@@ -1,10 +1,10 @@
 <turbo-stream action="replace" target="modal-feeds-new">
     <template>
         <?= $this->include('feeds/_new.phtml', [
-            'url' => $url,
-            'from' => $from,
+            'url' => $this->safe('url'),
+            'from' => $this->safe('from'),
             'errors' => $errors,
-            'error' => $error,
+            'error' => $this->safe('error'),
         ]); ?>
     </template>
 </turbo-stream>

src/views/links/repairing/_new.phtml

@@ -17,6 +17,7 @@
             <div
                 class="form-group <?= isset($errors['url']) ? 'form-group--invalid' : '' ?>"
                 data-controller="link-suggestion"
+                data-link-suggestion-url-value="<?= $this->safe('url_cleared') ?>"
             >
                 <label for="url">
                     <?= _('What’s the address of the link?') ?>
@@ -47,9 +48,7 @@
                         <p class="form-group__error" data-link-suggestion-target="message">
                             <?= _f('%s has detected trackers in this <abbr>URL</abbr>. Suggestion:', $brand) ?>
 
-                            <span data-link-suggestion-target="suggestion">
-                                <?= $url_cleared ?>
-                            </span>
+                            <?= $url_cleared ?>
 
                             <button
                                 class="button--small"

src/views/links/repairing/new.phtml

@@ -8,10 +8,10 @@
 
 <?= $this->include('links/repairing/_new.phtml', [
     'link' => $link,
-    'url' => $url,
-    'url_cleared' => $url_cleared,
+    'url' => $this->safe('url'),
+    'url_cleared' => $this->safe('url_cleared'),
     'ask_sync' => $ask_sync,
-    'from' => $from,
+    'from' => $this->safe('from'),
     'errors' => $errors,
-    'error' => $error,
+    'error' => $this->safe('error'),
 ]); ?>

src/views/links/repairing/new.turbo_stream.phtml

@@ -2,12 +2,12 @@
     <template>
         <?= $this->include('links/repairing/_new.phtml', [
             'link' => $link,
-            'url' => $url,
-            'url_cleared' => $url_cleared,
+            'url' => $this->safe('url'),
+            'url_cleared' => $this->safe('url_cleared'),
             'ask_sync' => $ask_sync,
-            'from' => $from,
+            'from' => $this->safe('from'),
             'errors' => $errors,
-            'error' => $error,
+            'error' => $this->safe('error'),
         ]); ?>
     </template>
 </turbo-stream>