effective_resources 2.16.1 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1e8e92150d8fa0101d28d961ccac6f0b8826a2992e22abe0f7f38ae185a498
-  data.tar.gz: c479a6c8c700a8125241914ffe0a17a1b58da136fc28479d6d1f1a5005241575
+  metadata.gz: 66b9fac622ba1011fb81e24ca565d714b78028bd464b14b8e199558eb2e795f1
+  data.tar.gz: 72736d311ac7c200758628c5cf4b31b840b2f7e16d482f26771b79b038bb46c1
 SHA512:
-  metadata.gz: 2db488f338acda47184ea4bf2a41d1420f338738ad97f98635e66353d00d9a5edcf61aaace5351c38becec2ee80f4884fcd7a522a3f661baa4f9b2671f0a23bb
-  data.tar.gz: cbaea70caa43ceeb87b17fa1a31162c5d4b5369e3e5435073fb73b05c5c0dcb564f12948fb88dc62b010c1485e06880999c320c9c8a31bc01ad905df6a9e5668
+  metadata.gz: 6db9023e73e61521f5265407d753831fc8cc62e0b4d5481692242ccbe4643cb59dfe7b077db2de7ee66b3be4bfdf13492816804c9b76a19ac186266f89e95080
+  data.tar.gz: 6027c08af646b16c6e218c6842c35448aca20420919512ca81b3af573fdbbbe4d9e359a193ba80b37548449a972dccc94064edc305c512f5683b38552de25e31

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

@@ -66,29 +66,42 @@ 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?(:shallow)
+          scope.shallow
+        elsif scope.respond_to?(:sorted)
+          scope.sorted
+        else
+          scope
         end
+
+        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.1'.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.1
 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