effective_resources 2.16.1 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1e8e92150d8fa0101d28d961ccac6f0b8826a2992e22abe0f7f38ae185a498
-  data.tar.gz: c479a6c8c700a8125241914ffe0a17a1b58da136fc28479d6d1f1a5005241575
+  metadata.gz: 55ffa99bff7ce09a36f31a7a12f9e0fb3eff53b07110a86724a1b7dad14a0438
+  data.tar.gz: 356be85dc5dd7cbaeb0bfdf562b22442ef7102277e4b76bd479e5a0e70823062
 SHA512:
-  metadata.gz: 2db488f338acda47184ea4bf2a41d1420f338738ad97f98635e66353d00d9a5edcf61aaace5351c38becec2ee80f4884fcd7a522a3f661baa4f9b2671f0a23bb
-  data.tar.gz: cbaea70caa43ceeb87b17fa1a31162c5d4b5369e3e5435073fb73b05c5c0dcb564f12948fb88dc62b010c1485e06880999c320c9c8a31bc01ad905df6a9e5668
+  metadata.gz: 676d8e7f03e37d0781c909570b543a8089d9eb5a8e54f215f05bedba1977b9ad49b99e009c2c5cf20a330294c2daf0079c455df957f0198d897b6752210c74a3
+  data.tar.gz: eb731aef09e46cea31da8fbdc57c591ec32e09f1c7454678635b51cdee10aedc1e991e3778b215e96da7b5797bc7322151f7864b5509f03ae6dcf8a30fdbdc41

data/app/models/effective/resources/forms.rb

@@ -66,29 +66,41 @@ module Effective
         end
       end
 
-      def search_form_field_collection(association = nil, max_id = 1000)
+      # Load the limit records + 1. If there are all there, return as: :string
+      # Otherwise return an Array of the processed results ready for a select field
+      # Only hit the database once
+      def search_form_field_collection(association = nil, limit: 100)
         res = (association.nil? ? self : Effective::Resource.new(association))
 
-        if res.max_id > max_id
-          { as: :string }
-        else
-          if res.klass.unscoped.respond_to?(:datatables_scope)
-            { collection: res.klass.datatables_scope.map { |obj| [obj.to_s, obj.id] } }
-          elsif res.klass.unscoped.respond_to?(:datatables_filter)
-            collection = res.klass.datatables_filter
+        # Return string if this isnt a relational thing
+        klass = res.klass
+        return { as: :string } unless klass.respond_to?(:unscoped)
 
-            if collection.kind_of?(Array)
-              { collection: collection }
-            else
-              { collection: collection.map { |obj| [obj.to_s, obj.id] } }
-            end
+        # Default scope
+        scope = res.klass.unscoped
 
-          elsif res.klass.unscoped.respond_to?(:sorted)
-            { collection: res.klass.sorted.map { |obj| [obj.to_s, obj.id] } }
-          else
-            { collection: res.klass.all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
-          end
+        scope = if scope.respond_to?(:datatables_scope)
+          scope.datatables_scope
+        elsif scope.respond_to?(:datatables_filter)
+          scope.datatables_filter
+        elsif scope.respond_to?(:sorted)
+          scope.sorted
+        else
+          scope
         end
+
+        scope = scope.deep if scope.respond_to?(:deep)
+        scope = scope.unarchived if scope.respond_to?(:unarchived)
+
+        # Now that we have the scope figured out let's pull the limit number of records into an Array
+        # If there are more than the limit, return as: :string
+        resources = scope.limit(limit).to_a
+        return { as: :string } unless resources.length < limit
+
+        # Otherwise there are less than the limit, so we can use a collection select
+        {
+          collection: resources.map { |obj| [obj.to_s, obj.id] }
+        }
       end
 
     end

data/app/models/effective/resources/sql.rb

@@ -22,11 +22,6 @@ module Effective
         klass.unscoped.table
       end
 
-      def max_id
-        return 999999 unless klass.respond_to?(:unscoped)
-        @max_id ||= klass.unscoped.maximum(klass.primary_key).to_i
-      end
-
       def sql_column(name)
         column = column(name)
         return nil unless table && column

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.16.1'.freeze
+  VERSION = '2.17.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.17.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails