Add tag filter to debates page
This commit is contained in:
@@ -33,6 +33,7 @@ var initialize_modules = function() {
|
|||||||
App.Stats.initialize();
|
App.Stats.initialize();
|
||||||
App.LocaleSwitcher.initialize();
|
App.LocaleSwitcher.initialize();
|
||||||
App.DebatesOrderSelector.initialize();
|
App.DebatesOrderSelector.initialize();
|
||||||
|
App.DebatesTagFilter.initialize();
|
||||||
};
|
};
|
||||||
|
|
||||||
$(function(){
|
$(function(){
|
||||||
|
|||||||
17
app/assets/javascripts/debates_tag_filter.js.coffee
Normal file
17
app/assets/javascripts/debates_tag_filter.js.coffee
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
App.DebatesTagFilter =
|
||||||
|
|
||||||
|
href_with_params: (query_params) ->
|
||||||
|
loc = window.location
|
||||||
|
|
||||||
|
loc.protocol + "//" + loc.hostname +
|
||||||
|
(if loc.port then ':' + loc.port else '') +
|
||||||
|
loc.pathname +
|
||||||
|
loc.hash +
|
||||||
|
'?' + $.param(query_params)
|
||||||
|
|
||||||
|
initialize: ->
|
||||||
|
$('.js-tag-filter').on 'change', ->
|
||||||
|
query_params = window.getQueryParameters()
|
||||||
|
query_params['tag'] = $(this).val()
|
||||||
|
window.location.assign(App.DebatesTagFilter.href_with_params(query_params))
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
class DebatesController < ApplicationController
|
class DebatesController < ApplicationController
|
||||||
before_action :parse_order, only: :index
|
before_action :parse_order, :parse_tag_filter, only: :index
|
||||||
before_action :authenticate_user!, except: [:index, :show]
|
before_action :authenticate_user!, except: [:index, :show]
|
||||||
|
|
||||||
load_and_authorize_resource
|
load_and_authorize_resource
|
||||||
@@ -77,4 +77,9 @@ class DebatesController < ApplicationController
|
|||||||
@order = @valid_orders.include?(params[:order]) ? params[:order] : 'created_at'
|
@order = @valid_orders.include?(params[:order]) ? params[:order] : 'created_at'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def parse_tag_filter
|
||||||
|
valid_tags = ActsAsTaggableOn::Tag.all.map(&:name)
|
||||||
|
@tag_filter = params[:tag] if valid_tags.include?(params[:tag])
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -12,11 +12,23 @@
|
|||||||
<!-- Filter topic results -->
|
<!-- Filter topic results -->
|
||||||
<div class="filters row">
|
<div class="filters row">
|
||||||
<div class="small-12 column">
|
<div class="small-12 column">
|
||||||
<h2>
|
<% if @tag_filter %>
|
||||||
<%= t("debates.index.filter_topic",
|
<h2>
|
||||||
number: "N",
|
<%= t("debates.index.filter_topic",
|
||||||
topic: "topic").html_safe %>
|
number: @debates.size,
|
||||||
</h2>
|
# TODO translation
|
||||||
|
topic: @tag_filter).html_safe %>
|
||||||
|
</h2>
|
||||||
|
<% else %>
|
||||||
|
<h2>Filtrar por tema: </h2>
|
||||||
|
<form class="inline-block">
|
||||||
|
<select class="js-tag-filter" name="tag-filter">
|
||||||
|
<%# select_tag 'tag-filter', nil, {prompt: 'Temas --', class: 'js-tag-filter'} do %>
|
||||||
|
<option value="default" disabled="disabled" selected="selected">Temas --</option>
|
||||||
|
<%= options_from_collection_for_select(ActsAsTaggableOn::Tag.all, :name, :name, prompt: 'Temas...') %>
|
||||||
|
</select>
|
||||||
|
</form>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- /. Filter topic results -->
|
<!-- /. Filter topic results -->
|
||||||
|
|||||||
@@ -407,4 +407,37 @@ feature 'Debates' do
|
|||||||
expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
|
expect(@most_liked_debate.title).to appear_before(@most_voted_debate.title)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
feature 'Debates can be filtered by tags', :js do
|
||||||
|
let!(:debate1) { create(:debate, tag_list: ["Deporte", "Corrupción"]) }
|
||||||
|
let!(:debate2) { create(:debate, tag_list: ["Deporte", "Corrupción", "Fiestas populares"]) }
|
||||||
|
let!(:debate3) { create(:debate, tag_list: ["Corrupción", "Fiestas populares"]) }
|
||||||
|
|
||||||
|
scenario 'By default no tag filter is applied' do
|
||||||
|
visit debates_path
|
||||||
|
|
||||||
|
expect(page).to have_content('Filtrar por tema')
|
||||||
|
expect(page).not_to have_content('con el tema')
|
||||||
|
expect(page).to have_selector('#debates .debate', count: 3)
|
||||||
|
expect(current_url).to_not include('tag=')
|
||||||
|
end
|
||||||
|
|
||||||
|
scenario 'Debates are filtered by single tag' do
|
||||||
|
visit debates_path
|
||||||
|
|
||||||
|
select('Deporte', from: 'tag-filter')
|
||||||
|
|
||||||
|
expect(page).not_to have_content('Filtrar por tema')
|
||||||
|
expect(page).to have_content('with the topic')
|
||||||
|
expect(page).not_to have_select('tag-filter')
|
||||||
|
expect(current_url).to include('tag=Deporte')
|
||||||
|
expect(page).to have_selector('#debates .debate', count: 2)
|
||||||
|
|
||||||
|
expect(page).to_not have_content(debate3.title)
|
||||||
|
expect(page).to have_content(debate1.title)
|
||||||
|
expect(page).to have_content(debate2.title)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user