faceted_search 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 427a86317140e3a5be8d82d673407cbafca492109bf7caf012abada45276ee3d
-  data.tar.gz: 237bfd5aaa130318a08508171b70e5e4d025a631cef19025390ef2ce77d6c2dc
+  metadata.gz: f82d1b15fdbb630bd290e8d915b5dd109b7e07ad17561c959043a44a13af4ade
+  data.tar.gz: c958ae79ef81325ae652ebe54a0c9fdfebe7ebd0ce8b60a30188c0bb3de3a062
 SHA512:
-  metadata.gz: 84153b104746f072e29c7dead126574830e5a35cf138c7647014c4282bbd6422bf34fee58ec0ccaf9c6c84bd265583798b756f73950516dcd9878438bcc73379
-  data.tar.gz: e74d114ffbaa6285aa414c94197031ea458a707a8a6329dbfac7ec1b4ad4aae7589805ec17f9b7e9a363d469c0fb0515368ac2e960ebdbe6e0543f28b7d6dd60
+  metadata.gz: 91a8751b4523d08c0dff7112a05d5d87eebd6ed69c1c7ace85d438093d521c5421e860adeee41beeb931c0833143ced6a45f2f0f0fc16dcbbffdbdec861f4bc9
+  data.tar.gz: cd64b29320ff0a978e436a5df1b48f8f98319d512c3c9984756bc352d6f74d911b1ea2bbc48dbffc4bf17382eed3e95275dd1375b69f8ba54060e0a4364ce178

data/app/assets/javascripts/faceted_search/Tree.js

@@ -40,17 +40,33 @@ window.facetedSearch.Tree.prototype.generateItem = function (item) {
     liNode.className = item.selected ? "dd-item dd-item--selected"
                                      : "dd-item";
 
-    var aNode = document.createElement('a');
-    aNode.setAttribute("href", item.url);
-    aNode.textContent = item.title;
+    var iconNode = null;
+    iconNode = document.createElement('i');
+    iconNode.className = "back-link fas fa-arrow-left";
+    var titleNode = document.createTextNode(item.title);
+
+    var itemContent = document.createDocumentFragment();
+    if (item.back === "true") {
+        itemContent.appendChild(iconNode);
+    }
+    itemContent.appendChild(titleNode);
+
+    if (item.url !== "") {
+        var aNode = document.createElement('a');
+        aNode.setAttribute("href", item.url);
+        aNode.appendChild(itemContent);
+        liNode.appendChild(aNode);
+    } else {
+        liNode.appendChild(itemContent);
+    }
 
-    liNode.appendChild(aNode);
 
     if (item.children.length > 0) {
         var olNode = this.generateList(item.children);
         liNode.appendChild(olNode);
     }
 
+
     return liNode;
 };
 
@@ -82,6 +98,7 @@ window.facetedSearch.Tree.prototype.initDOM = function () {
             selected: elt.getAttribute('data-selected') === "true",
             resultsCount: parseInt(elt.getAttribute('data-count'), 10),
             url: elt.getAttribute('data-url'),
+            back: elt.getAttribute('data-back'),
             title: elt.textContent.trim()
         };
     });
@@ -103,9 +120,9 @@ window.facetedSearch.Tree.prototype.initNestable = function () {
     "use strict";
 
     $('.dd', this.wrapper).nestable({
-        expandBtnHTML: '<button class="dd-expand-btn" data-action="expand" type="button"><i class="fas fa-folder"></i></button>',
-        collapseBtnHTML: '<button class="dd-collapse-btn" data-action="collapse" type="button"><i class="fas fa-folder-open"></i></button>'
-    }).data("nestable").collapseAll();
+        expandBtnHTML: '',
+        collapseBtnHTML: ''
+    }).data("nestable");
 };
 
 window.addEventListener('DOMContentLoaded', function () {

data/app/assets/stylesheets/faceted_search/nestable.sass

@@ -22,11 +22,15 @@
     font-size: 13px
     line-height: 20px
 
+
     a
         color: #8c8c8c
         &:hover
             color: #000
 
+    i.back-link
+        margin-right: 5px
+
     &--selected > a
         color: #000
 

data/app/models/faceted_search/facets/filter.rb

@@ -14,36 +14,50 @@ module FacetedSearch
     # and return the modified scope
     def add_scope(scope)
       return scope if params_array.blank?
-      habtm?  ? scope.joins(name).where(name => { find_by => params_array })
-              : scope.where(name => params_array)
+
+      identifiers = params_array.dup
+      identifiers << selected_objects.first.descendents if tree?
+      identifiers.flatten!
+
+      habtm?  ? scope.joins(name).where(name => { find_by => identifiers })
+              : scope.where(name => identifiers)
     end
 
     def find_by
       @options[:find_by] || :id
     end
 
+    def selected_objects
+      values.where(find_by => params_array)
+    end
+
     # Show all values that have corresponding results.
     # This is a regular SQL inner join.
     def values
-      joined_table = facets.model_table_name.to_sym
-      source.all.joins(joined_table).where(joined_table => { id: facets.model }).distinct
+      @values ||= get_values
     end
 
-    def value_selected?(value)
-      value.to_s.in? params_array
+    def tree_values
+      return values.select { |obj| obj.root? } if params_array.empty?
+
+      selected_object = selected_objects.first
+      return [] if selected_object.nil?
+
+      array = []
+      array << values.find   { |obj| obj.id == selected_object.parent_id } if selected_object.has_parent?   # parent
+      array << values.select { |obj| obj.parent_id == selected_object.parent_id }                           # selected & siblings
+      array << values.select { |obj| obj.parent_id == selected_object.id } if selected_object.has_children? # selected object's children
+      array.flatten.compact
     end
 
-    def results_with(value)
-      scope = @facets.model
-      @facets.list.each do |facet|
-        scope = facet == self ? add_scope_with_value(scope, value)
-                              : facet.add_scope(scope)
-      end
-      scope
+    def value_selected?(value)
+      value.to_s.in? params_array
     end
 
     def path_for(value)
       value = value.to_s
+      return path_for_tree(value) if tree?
+
       custom_params = params_array.dup
       value_selected?(value)  ? custom_params.delete(value)
                               : custom_params.push(value)
@@ -54,18 +68,24 @@ module FacetedSearch
       @options[:source] || name.to_s.singularize.titleize.constantize.send(:all)
     end
 
+    def has_params?
+      params_array.any?
+    end
+
     protected
 
-    def params_array
-      @params_array ||= @params.to_s.split(',')
+    def get_values
+      joined_table = facets.model_table_name.to_sym
+      source.all.joins(joined_table).where(joined_table => { id: facets.model }).distinct
     end
 
-    # Adds a scope corresponding to this facet
-    # to the scope sent as an argument with specific value
-    # and return the modified scope
-    def add_scope_with_value(scope, value)
-      habtm?  ? scope.joins(name).where(name => { find_by => value })
-              : scope.where(name => value)
+    def path_for_tree(value)
+      value_selected?(value) ? path('')
+      : path(value)
+    end
+
+    def params_array
+      @params_array ||= @params.to_s.split(',')
     end
 
     def habtm?

data/app/views/faceted_search/facets/_filter.html.erb

@@ -2,20 +2,28 @@
   <div class="faceted__facet__filter--tree">
     <div class="dd">
       <ol class="faceted__facet__filter--tree__level dd-list">
-        <% facet.source.each do |object| %>
+        <% facet.tree_values.each_with_index do |object, index| %>
           <%
           identifier = object.send facet.find_by
-          results_count = facet.results_with(identifier).count
-          facet_url = facet.facets.path_for(facet, identifier)
-          display_value = facet.display_method.call(object)
           selected = facet.value_selected?(identifier)
+          facet_url = selected ? '' : facet.facets.path_for(facet, identifier)
+          back = index == 0 && !selected && facet.has_params?
+          display_value = facet.display_method.call(object)
           parent_id = object.parent_id.nil? ? 0 : object.parent_id
           %>
-          <li data-parent="<%= parent_id %>"
+          <% if index == 0 && selected %>
+          <li data-parent="0"
+              data-id="-1"
+              data-back="true"
+              data-selected="false"
+              data-url="<%= facet.facets.path_for(facet, '') %>">
+          </li>
+          <% end %>
+          <li data-parent="<%= back ? 0 : parent_id %>"
               data-id="<%= object.id %>"
+              data-back="<%= back %>"
               data-selected="<%= selected %>"
-              data-url="<%= facet_url %>"
-              data-count="<%= results_count %>">
+              data-url="<%= facet_url %>">
             <%= display_value %>
           </li>
         <% end %>
@@ -27,12 +35,10 @@
     <% facet.values.each do |value| %>
       <%
       identifier = value.send facet.find_by
-      results_count = facet.results_with(identifier).count
       display_value = facet.display_method.call(value)
-      next if results_count.zero?
       %>
       <li class="faceted__facet__filter__value<%= '--selected' if facet.value_selected?(identifier) %>">
-        <%= link_to "#{display_value} (#{results_count})", facet.facets.path_for(facet, identifier) + anchor %>
+        <%= link_to display_value, facet.facets.path_for(facet, identifier) + anchor %>
       </li>
     <% end %>
   </ul>

data/lib/faceted_search/version.rb

@@ -1,3 +1,3 @@
 module FacetedSearch
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faceted_search
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Arnaud Levy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Faceted search with Active Record