Adds dynamic rendering of javascript helper

Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>

Adds dynamic rendering of javascript helper
Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
Dylan Guedes
1 parent abc8ae0c
Showing 6 changed files with 60 additions and 22 deletions Show diff stats
plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb
plugins/elasticsearch/public/javascripts/categories.js
plugins/elasticsearch/test/api/elasticsearch_plugin_api_test.rb
plugins/elasticsearch/views/elasticsearch_plugin/_search_collection.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/search.js.erb
@@ -7,8 +7,7 @@ class ElasticsearchPluginController &lt; ApplicationController
   helper ElasticsearchPluginHelper
   def index
-    search()
-    render :action => 'search'
+    search
   end
   def search
@@ -16,6 +15,11 @@ class ElasticsearchPluginController &lt; ApplicationController
     define_sort_types
     define_categories
     define_results
+    respond_to do |format|
+      format.html { render :action => 'search' }
+      format.js
+      params["format"] = ""
+    end
   end
   def define_results
@@ -4,14 +4,22 @@ var main = function() {
   var url = window.location.href;
   var indexOfCategories;
-  url = url.replace(/&categories.*/g, "");
-  url += "&categories=";
-
   $(".categories ul li input[checked]").map(function(idx, element) {
     categories.push(element.value);
   });
   $('.categories ul li input[type=checkbox]').on('click', function(){
+    var dataParams = {};
+
+    url = url.replace(/.*\?/, "");
+    var params = url.split('&');
+    console.log("Dataparams: ", params);
+    params.map(function(param) {
+      var item = param.split('=');
+      dataParams[item[0]] = item[1];
+    });
+
+
     var idx = categories.indexOf(this.value);
     if (idx == -1) {
       categories.push(this.value);
@@ -19,8 +27,16 @@ var main = function() {
       categories.splice(idx, 1);
     }
-    url += categories.join(",");
-    window.location.href = url;
+    $.ajax({
+      method: "GET",
+      url: "/search?format=js",
+      data: {
+        categories: categories.join(","),
+        selected_type: dataParams["selected_type"],
+        filter: dataParams["filter"],
+        query: dataParams["query"]
+      }
+    });
   });
 };
@@ -61,4 +61,16 @@ class ElasticsearchPluginApiTest &lt; ActiveSupport::TestCase
     assert_equal 200, last_response.status
     assert_equal 3, json["results"].count
   end
+
+  should 'respond with only categories from given model' do
+    get "/api/v1/search?selected_type=community&categories=1,2,3"
+    json = JSON.parse(last_response.body)
+    assert_equal 200, last_response.status
+    assert_equal 3, json["results"].count
+
+    get "/api/v1/search?selected_type=person&categories=1,2"
+    json = JSON.parse(last_response.body)
+    assert_equal 200, last_response.status
+    assert_equal 0, json["results"].count
+  end
 end
@@ -0,0 +1,15 @@
+<% for result in @results.to_a %>
+  <% for klass in @searchable_types.keys %>
+    <% next if klass.to_s.include? "all" %>
+    <% if result.is_a? klass.to_s.classify.constantize %>
+      <div class="search-item">
+        <%= render partial: "#{klass}_display", :locals => { klass => result} %>
+      </div>
+      <% break %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<div class="search_paginate">
+  <%= pagination_links @results if @results.count > 0 %>
+</div>
@@ -44,25 +44,14 @@
       <div class="categories">
         <h3 class="box-title"><%= _("Categories") %></h3>
-        <%= render_categories(@categories, @selected_categories) %>
+        <div id="categories-list">
+          <%= render_categories(@categories, @selected_categories) %>
+        </div>
       </div>
     </div>
     <div class="results">
-      <% for result in @results.to_a %>
-        <% for klass in @searchable_types.keys %>
-          <% next if klass.to_s.include? "all" %>
-          <% if result.is_a? klass.to_s.classify.constantize %>
-            <div class="search-item">
-              <%= render partial: "#{klass}_display", :locals => { klass => result} %>
-            </div>
-            <% break %>
-          <% end %>
-        <% end %>
-      <% end %>
-      <div class="search_paginate">
-        <%= pagination_links @results if @results.count > 0 %>
-      </div>
+      <%= render :partial => 'search_collection' %>
     </div>
   </div>
@@ -0,0 +1,2 @@
+$(".results").html("<%= escape_javascript(render partial: 'search_collection') %>");
+
	@@ -61,4 +61,16 @@ class ElasticsearchPluginApiTest < ActiveSupport::TestCase		@@ -61,4 +61,16 @@ class ElasticsearchPluginApiTest < ActiveSupport::TestCase
61	assert_equal 200, last_response.status	61	assert_equal 200, last_response.status
62	assert_equal 3, json["results"].count	62	assert_equal 3, json["results"].count
63	end	63	end
		64	+
		65	+ should 'respond with only categories from given model' do
		66	+ get "/api/v1/search?selected_type=community&categories=1,2,3"
		67	+ json = JSON.parse(last_response.body)
		68	+ assert_equal 200, last_response.status
		69	+ assert_equal 3, json["results"].count
		70	+
		71	+ get "/api/v1/search?selected_type=person&categories=1,2"
		72	+ json = JSON.parse(last_response.body)
		73	+ assert_equal 200, last_response.status
		74	+ assert_equal 0, json["results"].count
		75	+ end
64	end	76	end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+<% for result in @results.to_a %>
	2	+ <% for klass in @searchable_types.keys %>
	3	+ <% next if klass.to_s.include? "all" %>
	4	+ <% if result.is_a? klass.to_s.classify.constantize %>
	5	+ <div class="search-item">
	6	+ <%= render partial: "#{klass}_display", :locals => { klass => result} %>
	7	+ </div>
	8	+ <% break %>
	9	+ <% end %>
	10	+ <% end %>
	11	+<% end %>
	12	+
	13	+<div class="search_paginate">
	14	+ <%= pagination_links @results if @results.count > 0 %>
	15	+</div>
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+$(".results").html("<%= escape_javascript(render partial: 'search_collection') %>");
	2	+