spotlight_search 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576ead7e9ed602d984a2b141bbd9744df9f8ed760c32a72486f052af271aa6c9
-  data.tar.gz: 18c0360d8fd6fba83ee3bf84ff30f2e6e0eddcd1543a4c6056d1f904d564fefd
+  metadata.gz: '099ecfc87e93555a16a5e494f3b88f69cbe8688c967444b5fac831dc62b5b650'
+  data.tar.gz: 5d3853b623df2045aadb98b70f69dfd9faf9b8d0878a4cb080bdeccaf6f5f396
 SHA512:
-  metadata.gz: 17743dcac8dc528fd9f5cfa0713f51e109be3703f6d8ba3f380028b9ad65abd508acba501a7ee844e4e16cba8ba6d0ba4f00f9bac3d9fa8767f3c0bdf66a7772
-  data.tar.gz: 4aba022bdfff558c868077abf3f200e02e540e7392c0953dc71a984f605f22921efff26059408c2b13ec284a818926bb930abdc44c46541b8ffd44deec040383
+  metadata.gz: 651ec6f74e9c8d4bae5678be1636a157e13fa2420446ce50e4f0f7d68a438c0247d3f682f1759aedeed5d99095e5bd4a39957e99cad62ea38d747ad17dd8a068
+  data.tar.gz: 909f5d9e9a2472bd63d4d7db9ecd77e9c0007f4b10072eb1106ff7f411b45bf103c47de44dd9e03c1c64d8099bf85aa5cd21780287881036a5c4880ce03a7ab4

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

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]

data/lib/spotlight_search/version.rb

@@ -1,3 +1,3 @@
 module SpotlightSearch
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spotlight_search.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   # s.require_paths = ["lib"]
 
   s.add_development_dependency "bundler", "~> 2.0"
-  s.add_development_dependency "rake", ">= 12.3.3"
+  s.add_development_dependency "rake", "~> 13.0.1"
   s.add_development_dependency "rails", "~> 5.2.4.2"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_runtime_dependency 'caxlsx', "~> 3.0.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotlight_search
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Anbazhagan Palani
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement