spotlight_search 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db095dee4fcbb232c1f7eddd83dfdfe279243415f3f6e54636740c2abbbe9ac3
-  data.tar.gz: c93d9955d07504a7aecca13cca15d1655fa847d0c13b1dc3643414ceeab39cb3
+  metadata.gz: bc7f95a4b32cda3a0fe9572388d9e73ef1bc8d6f539ea2ec63423a59ac051403
+  data.tar.gz: 5f2873974e3fc88a2d8693d7dca287d3bb74af3c7538443d3188d78790d81e34
 SHA512:
-  metadata.gz: 67fc0b1c020ee49f59dbf539bf7854fcf65a8d8ce393b6315450c07812bec38020ace65fd29c36d76fb7408ddee3a6296c92ebf94dddc13026bc000660e26651
-  data.tar.gz: f4b76130d03a78c7fefdf61feffa8a61712097bd9807b479e3d9f41246fa69ed45bed3071a4df6b59ca94f5a3ea03dc0f1ecbdf74fdc701c6b845b92354b3123
+  metadata.gz: 4063285378cd29f80b0c7a3f67e907bd1f8cf549613754aa54c6633eae2e9037509a3224c83d38128a5119a6627210e7ebd74da591b58e7f9aea253b169fa9db
+  data.tar.gz: 85d4eae1e8ca517c454986bc383d57010b52971482b79e1e2285f651f534e57aad1685f8fe8418c8ca263d58897ac5b2fe2e6d4541fe1755a0413f61bfee729d

data/app/assets/javascripts/spotlight_search.js

@@ -74,6 +74,15 @@ $(document).on('keyup', '[data-type="input-filter"]', function() {
   });
 });
 
+$(document).on('change', '[data-type="range-filter"]', function() {
+  var thisObj;
+  thisObj = $(this);
+  return $(function() {
+    return get_paginated_list(1, thisObj);
+  });
+});
+
+
 $(document).on('change', '[data-type="select-filter"]', function() {
   var thisObj;
   thisObj = $(this);

data/app/controllers/spotlight_search/export_jobs_controller.rb

@@ -4,7 +4,9 @@ module SpotlightSearch
       begin
         klass = params[:class_name].constantize
         if klass.validate_exportable_columns(params[:columns])
-          ExportJob.perform_later(klass.name, params[:email], params[:columns], params[:filters], params[:sort])
+          (filter_params = params[:filters].permit!) if params[:filters].present?
+          (sort_params = params[:sort].permit!) if params[:sort].present?
+          ExportJob.perform_later(klass.name, params[:email], params[:columns], filter_params, sort_params)
           notice = 'Successfully queued for export'
         else
           notice = 'Invalid columns found'

data/app/jobs/spotlight_search/export_job.rb

@@ -26,6 +26,11 @@ module SpotlightSearch
           records = records.send(scope, scope_args)
         end
       end
+      if klass.default_filters.present?
+        klass.default_filters.each do |scope|
+          records = records.send(scope)
+        end
+      end
       if sort.present?
         records = records.order("#{sort['sort_column']} #{sort['sort_direction']}")
       end
@@ -63,12 +68,12 @@ module SpotlightSearch
 
     def create_excel_v2(records, class_name)
       flattened_records = records.map { |record| SpotlightSearch::Utils.flatten_hash(record) }
-      columns = flattened_records[0].keys
+      columns = flattened_records.map{|x| x.keys}.flatten.uniq.sort
       size_arr = []
       columns.size.times { size_arr << 22 }
       xl = Axlsx::Package.new
       xl.workbook.add_worksheet do |sheet|
-        sheet.add_row columns, b: true
+        sheet.add_row columns&.map(&:titleize), b: true
         flattened_records.each do |record|
           sheet.add_row(columns.map { |column| record[column] })
         end

data/lib/spotlight_search/exportable_columns_v2.rb

@@ -32,6 +32,10 @@ module SpotlightSearch
         self.enabled_columns = [*record_fields, **associated_fields]
       end
 
+      def default_scopes_for_export(*filter_scopes)
+        self.default_filters = filter_scopes
+      end      
+
       def _model_exportable_columns(klass, *record_fields, **associated_fields)
         # Gets all the valid columns of a model
         # If any column is invalid, it also returns it
@@ -85,6 +89,7 @@ module SpotlightSearch
 
     included do
       class_attribute :enabled_columns, instance_accessor: false, default: nil
+      class_attribute :default_filters, instance_accessor: false, default: nil
     end
   end
 end

data/lib/spotlight_search/helpers.rb

@@ -18,20 +18,20 @@ module SpotlightSearch
       end
     end
 
-    def column_pop_up(email, klass)
+    def column_pop_up(email, klass, required_filters = nil)
       tag.div class: "modal fade", id: "exportmodal", tabindex: "-1", role: "dialog", aria: {labelledby: "exportModal"} do
         tag.div class: "modal-dialog modal-lg", role: "document" do
           tag.div class: "modal-content" do
-            concat pop_ups(email, klass)
+            concat pop_ups(email, klass, required_filters)
           end
         end
       end
     end
 
-    def pop_ups(email, klass)
+    def pop_ups(email, klass, required_filters)
       tag.div do
         concat pop_up_header
-        concat pop_up_body(email, klass)
+        concat pop_up_body(email, klass, required_filters)
       end
     end
 
@@ -44,11 +44,12 @@ module SpotlightSearch
       end
     end
 
-    def pop_up_body(email, klass)
+    def pop_up_body(email, klass, required_filters)
       tag.div class: "modal-body" do
         form_tag '/spotlight_search/export_to_file', id: 'export-to-file-form', style: "width: 100%;", class:"spotlight-csv-export-form" do
           concat hidden_field_tag 'email', email, id: 'export-to-file-email'
           concat hidden_field_tag 'class_name', klass.to_s, id: 'export-to-file-klass'
+          filters_to_post_helper(required_filters) if required_filters
           params_to_post_helper(filters: controller.filter_params) if controller.filter_params
           params_to_post_helper(sort: controller.sort_params) if controller.sort_params
           case SpotlightSearch.exportable_columns_version
@@ -63,6 +64,12 @@ module SpotlightSearch
       end
     end
 
+    def filters_to_post_helper(required_filters)
+      URI.decode_www_form(required_filters.to_param).each do |param|
+        concat hidden_field_tag "filters[#{param[0]}]", param[1]
+      end      
+    end
+
     def params_to_post_helper(params)
       URI.decode_www_form(params.to_param).each do |param|
         concat hidden_field_tag param[0], param[1]
@@ -112,7 +119,7 @@ module SpotlightSearch
         end
       when 'daterange'
         tag.div class: 'filter-field' do
-          concat text_field_tag scope_name, '', class: "#{classes} filter-rangepicker", data: {behaviour: "filter", scope: scope_name, type: "input-filter"}, placeholder: "#{placeholder}"
+          concat text_field_tag scope_name, '', class: "#{classes} filter-rangepicker", data: {behaviour: "filter", scope: scope_name, type: "range-filter"}, placeholder: "#{placeholder}"
           concat tag.span class: 'fa fa-search search-icon'
         end
       end

data/lib/spotlight_search/utils.rb

@@ -2,11 +2,13 @@
 
 module SpotlightSearch::Utils
   class << self
-    def serialize_csv_columns(*columns, **hashes)
+    def serialize_csv_columns(*columns)
+      association_hash = columns.select{|columnable| columnable.class.eql?(Hash)}.last || {}
+      parent_table_columns = columns.select{|columnable| columnable.class.eql?(Symbol)}
       # Turns an arbitrary list of args and kwargs into a list of params to be used in a form
       # For example, turns SpotlightSearch::Utils.serialize_csv_columns(:a, :b, c: [:d, e: :h], f: :g)
       # into [:a, :b, "c/d", "c/e/h", "f/g"]
-      columns.map(&:to_s) + hashes.map do |key, value|
+      parent_table_columns.map(&:to_s) + association_hash.map do |key, value|
         serialize_csv_columns(*value).map do |column|
           "#{key}/#{column}"
         end

data/lib/spotlight_search/version.rb

@@ -1,3 +1,3 @@
 module SpotlightSearch
-  VERSION = "0.3.0"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotlight_search
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Anbazhagan Palani