Add filter by target

app/components/sdg_management/relations/index_component.html.erb

@@ -4,6 +4,9 @@
  <%= component.select_tag :goal_code, goal_options,
  include_blank: goal_blank_option,
  "aria-label": goal_label %>
+ <%= component.select_tag :target_code, target_options,
+ include_blank: target_blank_option,
+ "aria-label": target_label %>
 <% end %>
 
 <table>

app/components/sdg_management/relations/index_component.rb

@@ -38,7 +38,19 @@ def goal_blank_option
  t("admin.shared.search.advanced_filters.sdg_goals.all")
  end
 
+ def target_label
+ t("admin.shared.search.advanced_filters.sdg_targets.label")
+ end
+
+ def target_blank_option
+ t("admin.shared.search.advanced_filters.sdg_targets.all")
+ end
+
  def goal_options
  options_from_collection_for_select(SDG::Goal.all, :code, :code_and_title, params[:goal_code])
  end
+
+ def target_options
+ options_from_collection_for_select(SDG::Target.all.sort, :code, :code, params[:target_code])
+ end
 end

app/controllers/sdg_management/relations_controller.rb

@@ -6,6 +6,7 @@ def index
  @records = relatable_class
  .accessible_by(current_ability)
  .by_goal(params[:goal_code])
+ .by_target(params[:target_code])
  .order(:id)
  .page(params[:page])
 

app/models/concerns/sdg/relatable.rb

@@ -14,9 +14,17 @@ module SDG::Relatable
 
  class_methods do
  def by_goal(code)
+ by_sdg_related(SDG::Goal, code)
+ end
+
+ def by_target(code)
+ by_sdg_related(SDG::Target, code)
+ end
+
+ def by_sdg_related(sdg_class, code)
  return all if code.blank?
 
- joins(:sdg_goals).merge(SDG::Goal.where(code: code))
+ joins(sdg_class.table_name.to_sym).merge(sdg_class.where(code: code))
  end
  end
 

config/locales/en/admin.yml

@@ -1258,6 +1258,9 @@ en:
  sdg_goals:
  all: "All goals"
  label: "By goal"
+ sdg_targets:
+ all: "All targets"
+ label: "By target"
  label:
  booths: "Search booth by name or location"
  budget_investments: "Search investments by title, description or heading"

config/locales/es/admin.yml

@@ -1257,6 +1257,9 @@ es:
  sdg_goals:
  all: "Todos los objetivos"
  label: "Por objetivo"
+ sdg_targets:
+ all: "Todas las metas"
+ label: "Por meta"
  label:
  booths: "Buscar urna por nombre"
  budget_investments: "Buscar proyectos por título, descripción o partida"

spec/models/sdg/relatable_spec.rb

@@ -121,4 +121,25 @@
  expect(relatable.class.by_goal(goal.code)).to be_empty
  end
  end
+
+ describe ".by_target" do
+ it "returns everything if no code is provided" do
+ expect(relatable.class.by_target("")).to eq [relatable]
+ expect(relatable.class.by_target(nil)).to eq [relatable]
+ end
+
+ it "returns records associated with that target" do
+ same_association = create(:proposal, sdg_targets: [target])
+ both_associations = create(:proposal, sdg_targets: [target, another_target])
+
+ expect(relatable.class.by_target(target.code)).to match_array [same_association, both_associations]
+ end
+
+ it "does not return records not associated with that target" do
+ create(:proposal)
+ create(:proposal, sdg_targets: [another_target])
+
+ expect(relatable.class.by_target(target.code)).to be_empty
+ end
+ end
 end

spec/system/sdg_management/relations_spec.rb

@@ -114,6 +114,18 @@
  expect(page).not_to have_content "Hospital"
  end
  end
+
+ scenario "target filter" do
+ create(:budget_investment, title: "School", sdg_targets: [SDG::Target[4.1]])
+ create(:budget_investment, title: "Preschool", sdg_targets: [SDG::Target[4.2]])
+
+ visit sdg_management_budget_investments_path
+ select "4.1", from: "target_code"
+ click_button "Search"
+
+ expect(page).to have_content "School"
+ expect(page).not_to have_content "Preschool"
+ end
  end
 
  describe "Edit" do