activeadmin#293 - Scopes shouldn't show up when no filter results

Author: Matthew Brewer

features/index/index_scopes.feature

@@ -26,6 +26,23 @@ Feature: Index Scoping
     And I should see the scope "All" with the count 10
     And I should see 10 posts in the table
 
+  Scenario: Viewing resources with one scope and no results
+    Given 10 posts exist
+    And an index configuration of:
+     """
+     ActiveAdmin.register Post do
+       scope :all, :default => true
+       filter :title
+     end
+     """
+
+    When I fill in "Search Title" with "Hello World 17"
+    And I press "Filter"
+    And I should not see the scope "All"
+
+    When I am on the index page for posts
+    Then I should see the scope "All" selected
+
   Scenario: Viewing resources when scoping
     Given 6 posts exist
     And 4 published posts exist
@@ -46,8 +63,8 @@ Feature: Index Scoping
     And I should see 4 posts in the table
 
   Scenario: Viewing resources with optional scopes
-  	Given 10 posts exist
-  	And an index configuration of:
+    Given 10 posts exist
+    And an index configuration of:
     """
     ActiveAdmin.register Post do
       scope :all, :if => proc { false }
@@ -62,11 +79,11 @@ Feature: Index Scoping
       end
     end
     """
-  	Then I should see the scope "Default" selected
-  	And I should not see the scope "All"
-  	And I should not see the scope "Today"
-  	And I should see the scope "Shown"
-  	And I should see the scope "Default" with the count 10
+    Then I should see the scope "Default" selected
+    And I should not see the scope "All"
+    And I should not see the scope "Today"
+    And I should see the scope "Shown"
+    And I should see the scope "Default" with the count 10
 
   Scenario: Viewing resources with mulitple scopes as blocks
     Given 10 posts exist

lib/active_admin/views/components/scopes.rb

@@ -6,17 +6,21 @@ module Views
     class Scopes < ActiveAdmin::Component
       builder_method :scopes_renderer
 
+      include ActiveAdmin::ScopeChain
+
       def default_class_name
         "scopes table_tools_segmented_control"
       end
-      
+
       def tag_name
         'ul'
       end
 
       def build(scopes)
-        scopes.each do |scope|
-          build_scope(scope) if call_method_or_proc_on(self, scope.display_if_block)
+        unless current_filter_search_empty?
+          scopes.each do |scope|
+            build_scope(scope) if call_method_or_proc_on(self, scope.display_if_block)
+          end
         end
       end
 
@@ -53,7 +57,9 @@ def current_scope?(scope)
         end
       end
 
-      include ActiveAdmin::ScopeChain
+      def current_filter_search_empty?
+        collection.empty? && params.include?(:q)
+      end
 
       # Return the count for the scope passed in.
       def get_scope_count(scope)