Skip to content

[facet-sidebar] arranging filters and showing them when feat enabled #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kennethrioja wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[facet-sidebar] arranging filters and showing them when feat enabled #1221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions app/views/search/common/_facet_sidebar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ Variable that should be available
</h4>
</li>

<% if TeSS::Config.facets_max_age_list.include?(resource_type.name) %>
<%= render partial: 'search/common/facet_sidebar_max_age' %>
<% end %>

<% boolean_facets, regular_facets = available_facets(resources).partition { |f| f.field_name == :online } %>

<% if resource_type.name == 'Event' %>
Expand All @@ -53,36 +57,43 @@ Variable that should be available
<% end %>

<% resource_name = resource_type.model_name.human.downcase.pluralize %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'across_all_spaces',
count: '-',
enable_text: t('sidebar.filter.values.show_cross_space', resource: resource_name),
disable_text: t('sidebar.filter.values.hide_cross_space', resource: resource_name) } %>
<% if TeSS::Config.feature['spaces'] %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'across_all_spaces',
count: '-',
enable_text: t('sidebar.filter.values.show_cross_space', resource: resource_name),
disable_text: t('sidebar.filter.values.hide_cross_space', resource: resource_name) } %>
<% end %>

<% if resource_type.name == 'Event' %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'include_expired',
count: '-',
enable_text: t('sidebar.filter.values.show_past_events'),
disable_text: t('sidebar.filter.values.hide_past_events') } %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'include_disabled',
count: '-',
enable_text: t('sidebar.filter.values.show_disabled_events'),
disable_text: t('sidebar.filter.values.hide_disabled_events') } %>
<% unless TeSS::Config.feature['disabled'].include?('visibility') %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'include_disabled',
count: '-',
enable_text: t('sidebar.filter.values.show_disabled_events'),
disable_text: t('sidebar.filter.values.hide_disabled_events') } %>
<% end %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'include_broken_links',
count: '-',
enable_text: t('sidebar.filter.values.show_broken_links', resource: resource_type.model_name.human.downcase.pluralize),
disable_text: t('sidebar.filter.values.hide_broken_links', resource: resource_type.model_name.human.downcase.pluralize) } %>

<% elsif resource_type.name == 'Material' || resource_type.name == 'LearningPath' %>
<% resource_name = resource_type.model_name.human.downcase.pluralize %>
<% if resource_type.name == 'Material' %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'include_disabled',
count: '-',
enable_text: t('sidebar.filter.values.show_disabled', resource: resource_name),
disable_text: t('sidebar.filter.values.hide_disabled', resource: resource_name) } %>
<% unless TeSS::Config.feature['disabled'].include?('visibility') %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'include_disabled',
count: '-',
enable_text: t('sidebar.filter.values.show_disabled', resource: resource_name),
disable_text: t('sidebar.filter.values.hide_disabled', resource: resource_name) } %>
<% end %>
<%= render partial: 'search/common/facet_sidebar_boolean_filter',
locals: { facet_field: 'include_broken_links',
count: '-',
Expand All @@ -95,10 +106,6 @@ Variable that should be available
enable_text: t('sidebar.filter.values.show_archived', resource: resource_name),
disable_text: t('sidebar.filter.values.hide_archived', resource: resource_name) } %>
<% end %>

<% if TeSS::Config.facets_max_age_list.include?(resource_type.name) %>
<%= render partial: 'search/common/facet_sidebar_max_age' %>
<% end %>
</ul>

<% if current_user && (current_user.is_curator? || current_user.is_admin?) %>
Expand Down