Remove filter button of software search

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

Remove filter button of software search
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Luciano Prestes · Gabriela Navarro
1 parent 845ef636
Showing 4 changed files with 26 additions and 13 deletions Show diff stats
features/software_catalog.feature
features/step_definitions/mpog_steps.rb
public/software-catalog.js
views/search/_mpog_search_form.html.erb
@@ -34,23 +34,24 @@ Feature: Search software
     Then I should see "Software One"
     Then I should see "Software Two"
+  @selenium
   Scenario: Show software "One" when searching for "Software One"
     Given I go to /search/software_infos
     And I fill in "search-input" with "Software One"
-    And I press "Filter"
+    And I keyup on selector "#search-input"
     Then I should see "Software One"
     Then I should not see "Software Two"
+  @selenium
   Scenario: Show software ordered by name when "Name A-Z" is selected
     Given I go to /search/software_infos
     And I select "Name A-Z" from "sort"
-    And I press "Filter"
     Then I should see "Software One" before "Software Two"
+  @selenium
   Scenario: Show software in reverse order by name when "Name Z-A" is selected
     Given I go to /search/software_infos
     And I select "Name Z-A" from "sort"
-    And I press "Filter"
     Then I should see "Software Two" before "Software One"
   Scenario: Show softwares with selected category in filter
@@ -235,3 +235,8 @@ end
 Given /^I should see "([^"]*)" before "([^"]*)"$/ do |before, after|
   assert page.body.index("#{before}") < page.body.index("#{after}")
 end
+
+Given /^I keyup on selector "([^"]*)"$/ do |selector|
+  selector_founded = evaluate_script("jQuery('#{selector}').trigger('keyup').length != 0")
+  selector_founded.should be_true
+end
@@ -43,7 +43,7 @@
       $(this).prop('checked', false);
     });
-    dispatch_search_ajax(update_search_page_on_ajax);
+    dispatch_search_ajax(update_search_page_on_ajax, true);
   }
@@ -52,16 +52,16 @@
     $("#filter-categories-select-catalog").show();
     $("#filter-option-catalog-software").hide();
-    dispatch_search_ajax(update_search_page_on_ajax);
+    dispatch_search_ajax(update_search_page_on_ajax, true);
   }
-  function dispatch_search_ajax(callback) {
+  function dispatch_search_ajax(callback, enable_load) {
     var search_params = get_search_params();
-    console.log(search_params);
-
-    open_loading("Loading");
+    if(enable_load) {
+      open_loading("Loading");
+    }
     $.ajax({
       url: AJAX_URL.software_infos,
@@ -117,12 +117,20 @@
     $("#filter-categories-select-catalog").show();
     $("#filter-option-catalog-software").hide();
-    dispatch_search_ajax(update_search_page_on_ajax);
+    dispatch_search_ajax(update_search_page_on_ajax, true);
     show_head_message();
   }
   function update_page_by_ajax_on_select_change() {
-    dispatch_search_ajax(update_search_page_on_ajax);
+    dispatch_search_ajax(update_search_page_on_ajax, true);
+  }
+
+  function update_page_by_text_filter() {
+    var text = this.value;
+
+    if (text.length >= 3) {
+      dispatch_search_ajax(update_search_page_on_ajax, false);
+    }
   }
   function set_events() {
@@ -134,6 +142,7 @@
     $(".project-software").click(selectProjectSoftwareCheckbox);
     $("#software_display").change(update_page_by_ajax_on_select_change);
     $("#sort").change(update_page_by_ajax_on_select_change);
+    $("#search-input").keyup(update_page_by_text_filter);
   }
@@ -11,8 +11,6 @@
       <span class="formfield">
         <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50, :placeholder=>_("Type words about the software_info you're looking for") %>
       </span>
-
-      <%= submit_button(:search, _('Filter')) %>
     </div>
     <%= render :partial => 'search_form_extra_fields' %>
     <%= render :partial => 'catalog_filter' %>
	@@ -235,3 +235,8 @@ end		@@ -235,3 +235,8 @@ end
235	Given /^I should see "([^"])" before "([^"])"$/ do \|before, after\|	235	Given /^I should see "([^"])" before "([^"])"$/ do \|before, after\|
236	assert page.body.index("#{before}") < page.body.index("#{after}")	236	assert page.body.index("#{before}") < page.body.index("#{after}")
237	end	237	end
		238	+
		239	+Given /^I keyup on selector "([^"]*)"$/ do \|selector\|
		240	+ selector_founded = evaluate_script("jQuery('#{selector}').trigger('keyup').length != 0")
		241	+ selector_founded.should be_true
		242	+end