From c2710de5fcdce2465ee1b7b3117079e08d3f6fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Sun, 15 Oct 2023 16:39:01 +0200
Subject: [PATCH] Extract method to open links in a new window

This way we can slightly simplify the code.
---
 app/components/debates/new_component.html.erb               | 2 +-
 app/components/debates/new_component.rb                     | 1 +
 app/components/proposals/new_component.html.erb             | 2 +-
 app/components/proposals/new_component.rb                   | 1 +
 app/components/sdg/related_list_selector_component.html.erb | 6 ++----
 app/components/sdg/related_list_selector_component.rb       | 1 +
 .../shared/agree_with_terms_of_service_field_component.rb   | 6 +++---
 app/helpers/application_helper.rb                           | 4 ++++
 app/views/organizations/registrations/new.html.erb          | 6 ++----
 app/views/users/registrations/new.html.erb                  | 6 ++----
 app/views/verification/residence/new.html.erb               | 6 ++----
 11 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/components/debates/new_component.html.erb b/app/components/debates/new_component.html.erb
index 26866561a..17fb6c9b9 100644
--- a/app/components/debates/new_component.html.erb
+++ b/app/components/debates/new_component.html.erb
@@ -2,7 +2,7 @@
   <%= back_link_to debates_path, t("debates.index.section_header.title") %>
 
   <%= header do %>
-    <%= link_to t("debates.new.more_info"), help_path(anchor: "debates"), title: t("shared.target_blank"), target: "_blank" %>
+    <%= link_to t("debates.new.more_info"), help_path(anchor: "debates") %>
   <% end %>
 
   <aside>
diff --git a/app/components/debates/new_component.rb b/app/components/debates/new_component.rb
index 7ca2c1c9f..a22193cc4 100644
--- a/app/components/debates/new_component.rb
+++ b/app/components/debates/new_component.rb
@@ -1,6 +1,7 @@
 class Debates::NewComponent < ApplicationComponent
   include Header
   attr_reader :debate
+  delegate :new_window_link_to, to: :helpers
 
   def initialize(debate)
     @debate = debate
diff --git a/app/components/proposals/new_component.html.erb b/app/components/proposals/new_component.html.erb
index cc1d219a7..508335b8d 100644
--- a/app/components/proposals/new_component.html.erb
+++ b/app/components/proposals/new_component.html.erb
@@ -2,7 +2,7 @@
   <%= back_link_to proposals_path, t("proposals.index.section_header.title") %>
 
   <%= header do %>
-    <%= link_to t("proposals.new.more_info"), help_path(anchor: "proposals"), title: t("shared.target_blank"), target: "_blank" %>
+    <%= new_window_link_to t("proposals.new.more_info"), help_path(anchor: "proposals") %>
   <% end %>
 
   <aside>
diff --git a/app/components/proposals/new_component.rb b/app/components/proposals/new_component.rb
index 05dbc81c1..4f3bc0c32 100644
--- a/app/components/proposals/new_component.rb
+++ b/app/components/proposals/new_component.rb
@@ -1,6 +1,7 @@
 class Proposals::NewComponent < ApplicationComponent
   include Header
   attr_reader :proposal
+  delegate :new_window_link_to, to: :helpers
 
   def initialize(proposal)
     @proposal = proposal
diff --git a/app/components/sdg/related_list_selector_component.html.erb b/app/components/sdg/related_list_selector_component.html.erb
index 6e7f5bbf5..ad5d10bf3 100644
--- a/app/components/sdg/related_list_selector_component.html.erb
+++ b/app/components/sdg/related_list_selector_component.html.erb
@@ -14,10 +14,8 @@
     <%= f.text_field :related_sdg_list,
                      class: "input",
                      hint: sanitize(t("sdg.related_list_selector.hint",
-                                      link: link_to(t("sdg.related_list_selector.help.text"),
-                                                    sdg_help_path,
-                                                    title: t("shared.target_blank"),
-                                                    target: "_blank")),
+                                      link: new_window_link_to(t("sdg.related_list_selector.help.text"),
+                                                               sdg_help_path)),
                                     attributes: %w[href title target]),
                      data: { "suggestions-list": sdg_related_suggestions,
                              "remove-tag-text": t("sdg.related_list_selector.remove_tag") } %>
diff --git a/app/components/sdg/related_list_selector_component.rb b/app/components/sdg/related_list_selector_component.rb
index 2770de026..de9c61a02 100644
--- a/app/components/sdg/related_list_selector_component.rb
+++ b/app/components/sdg/related_list_selector_component.rb
@@ -1,5 +1,6 @@
 class SDG::RelatedListSelectorComponent < ApplicationComponent
   attr_reader :f
+  delegate :new_window_link_to, to: :helpers
 
   def initialize(form)
     @f = form
diff --git a/app/components/shared/agree_with_terms_of_service_field_component.rb b/app/components/shared/agree_with_terms_of_service_field_component.rb
index 49dcbd256..26f8f86b8 100644
--- a/app/components/shared/agree_with_terms_of_service_field_component.rb
+++ b/app/components/shared/agree_with_terms_of_service_field_component.rb
@@ -1,5 +1,6 @@
 class Shared::AgreeWithTermsOfServiceFieldComponent < ApplicationComponent
   attr_reader :form
+  delegate :new_window_link_to, to: :helpers
 
   def initialize(form)
     @form = form
@@ -9,8 +10,7 @@ class Shared::AgreeWithTermsOfServiceFieldComponent < ApplicationComponent
 
     def label
       t("form.accept_terms",
-        policy: link_to(t("form.policy"), "/privacy", target: "_blank", title: t("shared.target_blank")),
-        conditions: link_to(t("form.conditions"), "/conditions", target: "_blank",
-                                                                 title: t("shared.target_blank")))
+        policy: new_window_link_to(t("form.policy"), "/privacy"),
+        conditions: new_window_link_to(t("form.conditions"), "/conditions"))
     end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fb69f2bb9..4c5ed1c23 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -30,6 +30,10 @@ module ApplicationHelper
     end
   end
 
+  def new_window_link_to(text, path, **options)
+    link_to text, path, { target: "_blank", title: t("shared.target_blank") }.merge(options)
+  end
+
   def image_path_for(filename)
     image = SiteCustomization::Image.image_for(filename)
 
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index a850766e2..e6d5e8426 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -26,10 +26,8 @@
 
       <%= f.check_box :terms_of_service,
                       label: t("devise_views.users.registrations.new.terms",
-                               terms: link_to(t("devise_views.users.registrations.new.terms_link"),
-                                              "/conditions",
-                                              title: t("shared.target_blank"),
-                                              target: "_blank")) %>
+                               terms: new_window_link_to(t("devise_views.users.registrations.new.terms_link"),
+                                                         "/conditions")) %>
 
       <div class="small-12 medium-6 small-centered">
         <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index cdb376fb7..11e1645d2 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -36,10 +36,8 @@
 
       <%= f.check_box :terms_of_service,
                       label: t("devise_views.users.registrations.new.terms",
-                               terms: link_to(t("devise_views.users.registrations.new.terms_link"),
-                                              "/conditions",
-                                              title: t("shared.target_blank"),
-                                              target: "_blank")) %>
+                               terms: new_window_link_to(t("devise_views.users.registrations.new.terms_link"),
+                                                         "/conditions")) %>
 
       <div class="small-12 medium-6 small-centered">
         <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index 1dbcee3e3..a0d9b955e 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -70,10 +70,8 @@
       <div class="small-12">
         <%= f.check_box :terms_of_service,
                         label: t("verification.residence.new.accept_terms_text",
-                                 terms_url: link_to(t("verification.residence.new.terms"),
-                                                    page_path("census_terms"),
-                                                    title: t("shared.target_blank"),
-                                                    target: "_blank")) %>
+                                 terms_url: new_window_link_to(t("verification.residence.new.terms"),
+                                                               page_path("census_terms"))) %>
       </div>
 
       <div class="small-12 medium-3 clear">