simple_drilldown 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca344402dbcb15946fe11948f5548b6802df4d50f97b8a6c596c10728b1f8c0
-  data.tar.gz: af4df3909a14d2d7dcf6ba4838d6585ca0947dce7139247316aa49b4cdc3b803
+  metadata.gz: 2a4c733a59b4e632b71fa7752a8d19f4fc47dde7868cf013e0bdbf896276e98f
+  data.tar.gz: 3f7350f9f4d88c14a5351158705400110fe57f9e7f1c03bd84c65fd7603b0290
 SHA512:
-  metadata.gz: 72502b99cd7db75b86b75d42a0b89210e0836c4357f75f56636f22a763cf5f8f2bb48ef8b23acd84ad3125e2d36a7ac5a99f3fd86379d574e0b2c19d0b957ab3
-  data.tar.gz: fb60b7c5f49a48bd04160e2ce4f522dea38fa8794d402ed2356631a2e17ef5dabbc95268118d288beb41f8b15119ae9dea14b58804b18b6b4ad16b6025c1079c
+  metadata.gz: 18c58a49d658729ae364559a55cf59e9677e8ff7d20a5ad3d4e8b8ea7cbff7f69b309bfd717e75394e002322eff22f15878ee37ee15677a515feb0f05b95e832
+  data.tar.gz: 635d388bed35d0b91e83d2676093178d9ed8bb767325ecdbcbb9c519c81bb43bf9bb082797be85bdd424050f5b18918ec79a72c0fd885deb8efc7adc3c48ffc7

data/app/views/simple_drilldown/_chart.html.erb

@@ -87,11 +87,11 @@
     firstPoint = chart.getElementsAtEventForMode(e, 'nearest', { intersect: true }, false)[0]
     if (firstPoint) {
     label = chart.data.labels[firstPoint.index];
-    value = chart.data.datasets[firstPoint.datasetIndex].data[firstPoint._index];
-    console.log("Label: " + label + ", Value: " + value);
-    new_location = window.location.toString();
+    console.log("Label: " + label);
+    new_location = decodeURI(window.location.toString());
     new_location = new_location.replace(/#.*$/, '');
     new_location = new_location.replace("&search[dimensions][]=<%= @dimensions[0][:url_param_name] %>", '');
+    new_location = new_location.replaceAll(/&search\[filter\]\[<%= @dimensions[0][:url_param_name] %>\]\[\]=[^&#]*/g, '');
     new_location = new_location + '&search[filter][<%= @dimensions[0][:url_param_name] %>][]=' + label;
     console.log(new_location);
     window.location = new_location;

data/lib/simple_drilldown/controller.rb

@@ -155,7 +155,7 @@ module SimpleDrilldown
           dimension_def = c_dimension_defs[field.to_s]
           result_sets = dimension_def[:queries].map do |query|
             includes = merge_includes(includes, query[:includes]) if query[:includes]
-            rows_query = c_target_class.unscoped.where(c_base_condition)
+            rows_query = c_target_class.unscoped.where(realized_where(c_base_condition))
                                        .select("#{query[:select]} AS value")
                                        .joins(make_join([], c_target_class.name.underscore.to_sym, includes))
                                        .order('value')
@@ -163,7 +163,7 @@ module SimpleDrilldown
             rows_query = rows_query.without_deleted if c_target_class.try :paranoid?
             rows_query = rows_query.where(filter_conditions) if filter_conditions
             if (where = query[:where])
-              where_mapped = where.map { |e| e.respond_to?(:call) ? e.call : e }
+              where_mapped = realized_where(where)
               rows_query = rows_query.where(where_mapped)
             end
             rows = rows_query.to_a
@@ -184,6 +184,15 @@ module SimpleDrilldown
         end
       end
 
+      def realized_where(where)
+        case where
+        when Array
+          where.map { |e| e.respond_to?(:call) ? e.call : e }
+        else
+          where
+        end
+      end
+
       def make_conditions(search_filter)
         includes = c_base_includes.dup
         if search_filter
@@ -393,7 +402,7 @@ module SimpleDrilldown
       group = nil if group.empty?
 
       joins = self.class.make_join([], c_target_class.name.underscore.to_sym, includes)
-      row_query = c_target_class.unscoped.where(c_base_condition).select(select)
+      row_query = c_target_class.unscoped.where(self.class.realized_where(c_base_condition)).select(select)
       row_query = row_query.where(conditions) if conditions
       rows = row_query.joins(joins).group(group).order(order).to_a
       if rows.empty?
@@ -598,7 +607,8 @@ module SimpleDrilldown
       end
       joins = self.class.make_join([], c_target_class.name.underscore.to_sym, list_includes)
       list_conditions = list_conditions(conditions, values)
-      base_query = c_target_class.unscoped.where(c_base_condition).joins(joins).order(c_list_order)
+      base_query = c_target_class.unscoped.where(self.class.realized_where(c_base_condition)).joins(joins)
+                                 .order(c_list_order)
       base_query = base_query.where(list_conditions) if list_conditions
       result[:records] = base_query.to_a
     end

data/lib/simple_drilldown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleDrilldown
-  VERSION = '0.14.0'
+  VERSION = '0.14.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails