Merge pull request #463 from platanus/fix-nested-with-collection-filtering

Fix nested with collection filtering

Author: difernandez

CHANGELOG.md

@@ -8,6 +8,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * Defines required ruby version to >=2.7.0 [#460](https://github.com/platanus/activeadmin_addons/pull/460)
 * Nested and search select now use the name of the association instead of the name of id [#462](https://github.com/platanus/activeadmin_addons/pull/462)
 
+#### Fixes
+* Include only items that belong to parent when using collection option in a nested input level [#463](https://github.com/platanus/activeadmin_addons/pull/463)
+
 ### 2.0.0.beta-0
 
 #### Breaking changes

app/inputs/nested_level_input.rb

@@ -48,7 +48,7 @@ def load_collection_data
 
     collection_options = collection_to_select_options do |item, option|
       if @options[:parent_attribute].present?
-        option[@options[:parent_id_attribute]] = item.send(@options[:parent_id_attribute])
+        option[@options[:parent_attribute]] = item.send(@options[:parent_id_attribute])
       end
     end
 

app/javascript/activeadmin_addons/inputs/slim-select-nested.js

@@ -25,10 +25,12 @@ function collectionSearch(search, args, collection) {
     return Promise.reject('Search term too short');
   }
 
-  const data = JSON.parse(collection).map(
+  const data = JSON.parse(collection).filter(
+    (item) => (!args.parent || item[args.parent] === Number(args.parentId)) &&
+      String(item.text).toLowerCase().includes(search.toLowerCase()),
+  ).map(
     (item) => ({ value: String(item.id), text: item.text }),
-  ).filter(
-    (item) => String(item.text).toLowerCase().includes(search.toLowerCase()));
+  );
 
   return Promise.resolve(data);
 }

spec/features/inputs/nested_select_input_spec.rb

@@ -99,33 +99,48 @@
       end
     end
 
-    context "updating medium level" do
-      before do
-        on_input_ctx("invoice_region") do
-          open_slimselect_options
-          slimselect_search_input.set("Antof")
+    context "when updating medium level (that uses collection option)" do
+      context 'when searching for region that does not belong to selected country' do
+        before do
+          on_input_ctx("invoice_region") do
+            open_slimselect_options
+            slimselect_search_input.set("Cuy")
+          end
         end
-      end
 
-      it "shows results based on entered text", js: true do
-        expect_slimselect_result_text_to_eq(1, "Antofagasta")
+        it "does not show results", js: true do
+          expect_slimselect_no_result
+        end
       end
 
-      context "after click option" do
+      context 'when searching for region that belongs to selected country' do
         before do
-          on_input_ctx("invoice_region") { click_slimselect_option("Antofagasta") }
+          on_input_ctx("invoice_region") do
+            open_slimselect_options
+            slimselect_search_input.set("Antof")
+          end
         end
 
-        it "sets value", js: true do
-          on_input_ctx("invoice_region") { expect_slimselect_selection("Antofagasta") }
+        it "shows results based on entered text", js: true do
+          expect_slimselect_result_text_to_eq(1, "Antofagasta")
         end
 
-        it "preserves parent value", js: true do
-          on_input_ctx("invoice_country") { expect_slimselect_selection("Chile") }
-        end
+        context "when clicking option" do
+          before do
+            on_input_ctx("invoice_region") { click_slimselect_option("Antofagasta") }
+          end
 
-        it "resets children values", js: true do
-          on_input_ctx("invoice_city") { expect_slimselect_empty_selection }
+          it "sets value", js: true do
+            on_input_ctx("invoice_region") { expect_slimselect_selection("Antofagasta") }
+          end
+
+          it "preserves parent value", js: true do
+            on_input_ctx("invoice_country") { expect_slimselect_selection("Chile") }
+          end
+
+          it "resets children values", js: true do
+            on_input_ctx("invoice_city") { expect_slimselect_empty_selection }
+          end
         end
       end
     end

spec/support/capybara_helpers.rb

@@ -99,6 +99,12 @@ def expect_slimselect_result_text_to_eq(result_number, text)
     )
   end
 
+  def expect_slimselect_no_result
+    expect(page).to have_css(
+      "div.ss-search", text: 'No Result'
+    )
+  end
+
   def expect_slimselect_error(text)
     expect(page).to have_css(".ss-error", text: text)
   end