consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make target filter change when goal filter changes

Browse Source 
Note we're using both the `hidden` and `disabled` properties to
guarantee compatibility with user agents which might still display the
option even when using the `hidden` attribute or hiding it with
`display: none`. We could also use `hide()` and `show()` instead of the
`hidden` property, but since we're using the `disabled` property, I
thought the code would be easier to read if we used properties in both
cases.

Also note users will no longer be able to get, let's say, debates which
are related to goal 1 and target 2.1. We think this use case is highly
unlikely and there's no need to take it into account.
This commit is contained in:
Javi Martín
2021-01-28 13:46:08 +01:00
parent 0aa0a9c16b
commit 08c410cc93
7 changed files with 96 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/advanced_search.js
View File

@@ -32,6 +32,8 @@
App.AdvancedSearch.toggle_date_options();
}
});
App.SDGSyncGoalAndTargetFilters.sync($("#advanced_search_form"));
}
};
}).call(this);

4
app/assets/javascripts/application.js
View File

@@ -112,7 +112,8 @@
//= require columns_selector
//= require budget_edit_associations
//= require datepicker
//= require sdg/related_list_selector
//= require_tree ./sdg
//= require_tree ./sdg_management
var initialize_modules = function() {
"use strict";
@@ -166,6 +167,7 @@ var initialize_modules = function() {
App.BudgetEditAssociations.initialize();
App.Datepicker.initialize();
App.SDGRelatedListSelector.initialize();
App.SDGManagementRelationSearch.initialize();
};
var destroy_non_idempotent_modules = function() {

28
app/assets/javascripts/sdg/sync_goal_and_target_filters.js Normal file
View File

@@ -0,0 +1,28 @@
(function() {
"use strict";
App.SDGSyncGoalAndTargetFilters = {
sync: function(form) {
var goal_filter = form.find("[name*=goal]");
var target_filter = form.find("[name*=target]");
goal_filter.on("change", function() {
if (this.value) {
App.SDGSyncGoalAndTargetFilters.enable_goal_options(target_filter, this.value);
} else {
target_filter.find("option").prop("disabled", false).prop("hidden", false);
}
}).trigger("change");
},
enable_goal_options: function(target_filter, goal_code) {
var base_target_code = goal_code + ".";
var target_selector = "[value^='" + base_target_code + "'], [value='']";
target_filter.find("option" + target_selector).prop("disabled", false).prop("hidden", false);
target_filter.find("option:not(" + target_selector + ")").prop("disabled", true).prop("hidden", true);
if (!target_filter[0].value.startsWith(base_target_code)) {
target_filter.val("");
}
}
};
}).call(this);

8
app/assets/javascripts/sdg_management/relations/search.js Normal file
View File

@@ -0,0 +1,8 @@
(function() {
"use strict";
App.SDGManagementRelationSearch = {
initialize: function() {
App.SDGSyncGoalAndTargetFilters.sync($(".sdg-relations-search"));
}
};
}).call(this);

2
app/components/sdg_management/relations/search_component.html.erb
View File

@@ -1,4 +1,4 @@
<%= render Admin::SearchComponent.new(label: label, class: "complex") do |component| %>
<%= render Admin::SearchComponent.new(label: label, class: "sdg-relations-search complex") do |component| %>
<%= component.select_tag :goal_code, goal_options,
include_blank: goal_blank_option,
"aria-label": goal_label %>

28
spec/system/advanced_search_spec.rb
View File

@@ -371,6 +371,7 @@ describe "Advanced search", :js do
before do
Setting["feature.sdg"] = true
Setting["sdg.process.debates"] = true
Setting["sdg.process.proposals"] = true
Setting["sdg.process.budgets"] = true
end
@@ -389,6 +390,10 @@ describe "Advanced search", :js do
expect(page).to have_content "Purifier"
expect(page).not_to have_content "Hospital"
end
expect(page).to have_select "By target",
selected: "Select a target",
enabled_options: ["Select a target"] + %w[6.1 6.2 6.3 6.4 6.5 6.6 6.A 6.B]
end
scenario "Search by target" do
@@ -409,6 +414,29 @@ describe "Advanced search", :js do
expect(page).not_to have_content("Unrelated")
end
end
scenario "Dynamic target options depending on the selected goal" do
visit proposals_path
click_link "Advanced search"
select "1. No Poverty", from: "By SDG"
expect(page).to have_select "By target",
selected: "Select a target",
enabled_options: ["Select a target"] + %w[1.1 1.2 1.3 1.4 1.5 1.A 1.B]
select "1.1", from: "By target"
select "13. Climate Action", from: "By SDG"
expect(page).to have_select "By target",
selected: "Select a target",
enabled_options: ["Select a target"] + %w[13.1 13.2 13.3 13.A 13.B]
select "13.1", from: "By target"
select "Select a goal", from: "By SDG"
expect(page).to have_select "By target", selected: "13.1", disabled_options: []
end
end
end
end

26
spec/system/sdg_management/relations_spec.rb
View File

@@ -152,6 +152,10 @@ describe "SDG Relations", :js do
expect(page).to have_content "School"
expect(page).not_to have_content "Hospital"
expect(page).to have_css "li.is-active h2", exact_text: "Pending"
expect(page).to have_select "By target",
selected: "All targets",
enabled_options: ["All targets"] + %w[4.1 4.2 4.3 4.4 4.5 4.6 4.7 4.A 4.B 4.C]
end
scenario "target filter" do
@@ -200,6 +204,28 @@ describe "SDG Relations", :js do
expect(page).to have_css "li.is-active h2", exact_text: "All"
end
scenario "dynamic target options depending on the selected goal" do
visit sdg_management_polls_path
select "1. No Poverty", from: "By goal"
expect(page).to have_select "By target",
selected: "All targets",
enabled_options: ["All targets"] + %w[1.1 1.2 1.3 1.4 1.5 1.A 1.B]
select "1.1", from: "By target"
select "13. Climate Action", from: "By goal"
expect(page).to have_select "By target",
selected: "All targets",
enabled_options: ["All targets"] + %w[13.1 13.2 13.3 13.A 13.B]
select "13.1", from: "By target"
select "All goals", from: "By goal"
expect(page).to have_select "By target", selected: "13.1", disabled_options: []
end
end
end