Merge pull request #2190 from consul/related-content-form

Related content form

app/controllers/related_contents_controller.rb

@@ -0,0 +1,42 @@
+class RelatedContentsController < ApplicationController
+  VALID_URL = /#{Setting['url']}\/.*\/.*/
+
+  skip_authorization_check
+
+  def create
+    if relationable_object && related_object
+      @relationable.relate_content(@related)
+
+      flash[:success] = t('related_content.success')
+    else
+      flash[:error] = t('related_content.error', url: Setting['url'])
+    end
+
+    redirect_to @relationable
+  end
+
+  private
+
+  def valid_url?
+    params[:url].match(VALID_URL)
+  end
+
+  def relationable_object
+    @relationable = (params[:relationable_klass].singularize.camelize.constantize).find_by_id(params[:relationable_id])
+  end
+
+  def related_object
+    begin
+      if valid_url?
+        url = params[:url]
+
+        related_klass = url.match(/\/(#{RelatedContent::RELATIONABLE_MODELS.join("|")})\//)[0].gsub("/", "")
+        related_id = url.match(/\/[0-9]+/)[0].gsub("/", "")
+
+        @related = (related_klass.singularize.camelize.constantize).find_by_id(related_id)
+      end
+    rescue
+      nil
+    end
+  end
+end

app/models/related_content.rb

@@ -1,5 +1,6 @@
 class RelatedContent < ActiveRecord::Base
   RELATED_CONTENTS_REPORT_THRESHOLD = Setting['related_contents_report_threshold'].to_i
+  RELATIONABLE_MODELS = %w{proposals debates}
 
   belongs_to :parent_relationable, polymorphic: true
   belongs_to :child_relationable, polymorphic: true

app/views/relationable/_form.html.erb

@@ -0,0 +1,22 @@
+<%= form_tag related_contents_path, method: :post, id: "related_content", class: "hide", "data-toggler": ".hide" do %>
+    <label><%= t("related_content.label") %></label>
+
+    <p class="help-text" id="related_content_help_text">
+      <%= t("related_content.help", models: t('related_content.content_title').values.to_sentence, org: setting['org_name']) %>
+    </p>
+
+    <div class="input-group">
+      <div class="input-group-field">
+        <%= text_field_tag :url, '',
+                          "aria-describedby": "related_content_help_text",
+                          placeholder: t("related_content.placeholder", url: setting['url']) %>
+
+        <%= hidden_field_tag :relationable_klass, relationable.class.name %>
+        <%= hidden_field_tag :relationable_id, relationable.id %>
+      </div>
+
+      <div class="input-group-button">
+        <%= submit_tag t("related_content.submit"), class: "button" %>
+      </div>
+    </div>
+  <% end %>

app/views/relationable/_related_content.html.erb

@@ -4,12 +4,15 @@
     <h2 class="inline-block">
       <%= t("related_content.title") %>&nbsp;<span>(<%= relationable.relationed_contents.count %>)</span>
     </h2>
-
-    <a data-toggle="related_content" class="add-related-content">
-      <%= t("related_content.add") %>
+    <a>
+      <button type="button" data-toggle="related_content" class="add-related-content" id="add-related-content">
+        <%= t("related_content.add") %>
+      </button>
     </a>
   </div>
 
+  <%= render 'relationable/form', relationable: relationable %>
+
   <%= render 'relationable/related_list', relationable: relationable %>
 
 </div>

config/locales/en/general.yml

@@ -817,7 +817,7 @@ en:
     add: "Add related content"
     label: "Link to related content"
     placeholder: "%{url}"
-    help: "You can add any link inside of %{org}."
+    help: "You can add links of %{models} inside of %{org}."
     submit: "Add"
     error: "Link not valid. Remember to start with %{url}."
     success: "You added a new related content"

config/locales/es/general.yml

@@ -814,7 +814,7 @@ es:
     add: "Añadir contenido relacionado"
     label: "Enlace a contenido relacionado"
     placeholder: "%{url}"
-    help: "Puedes introducir cualquier enlace que esté dentro de %{org}."
+    help: "Puedes introducir cualquier enlace de %{models} que esté dentro de %{org}."
     submit: "Añadir"
     error: "Enlace no válido. Recuerda que debe empezar por %{url}."
     success: "Has añadido un nuevo contenido relacionado"

config/routes.rb

@@ -462,6 +462,8 @@ Rails.application.routes.draw do
     root to: "dashboard#index"
   end
 
+  resources :related_contents, only: [:create]
+
   # GraphQL
   get '/graphql', to: 'graphql#query'
   post '/graphql', to: 'graphql#query'

spec/features/proposals_spec.rb

@@ -139,6 +139,57 @@ feature 'Proposals' do
         expect(page).to have_content(proposal1.title)
       end
     end
+
+    scenario 'related contents can be added' do
+      proposal1 = create(:proposal)
+      proposal2 = create(:proposal)
+      debate1 = create(:debate)
+
+      visit proposal_path(proposal1)
+
+      expect(page).to have_selector('#related_content', visible: false)
+      click_on("Add related content")
+      expect(page).to have_selector('#related_content', visible: true)
+
+      within("#related_content") do
+        fill_in 'url', with: "#{Setting['url']}/proposals/#{proposal2.to_param}"
+        click_button "Add"
+      end
+
+      within("#related-content-list") do
+        expect(page).to have_content(proposal2.title)
+      end
+
+      visit proposal_path(proposal2)
+
+      within("#related-content-list") do
+        expect(page).to have_content(proposal1.title)
+      end
+
+      within("#related_content") do
+        fill_in 'url', with: "#{Setting['url']}/debates/#{debate1.to_param}"
+        click_button "Add"
+      end
+
+      within("#related-content-list") do
+        expect(page).to have_content(debate1.title)
+      end
+    end
+
+    scenario 'if related content URL is invalid returns error' do
+      proposal1 = create(:proposal)
+
+      visit proposal_path(proposal1)
+
+      click_on("Add related content")
+
+      within("#related_content") do
+        fill_in 'url', with: "http://invalidurl.com"
+        click_button "Add"
+      end
+
+      expect(page).to have_content("Link not valid. Remember to start with #{Setting[:url]}.")
+    end
   end
 
   context "Embedded video" do