effective_resources 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d0561a1b60dbeb0818d5f475f859e1e482624c9006fe9655330b516f98c6cb
-  data.tar.gz: 721366e5cec1195d508f117a0cb7b4239720a698a94c338feb15f5f29bcf2936
+  metadata.gz: 2f7e34ae7d9694f5c661938ca3be425aafa8e485777805079a9295284ace1028
+  data.tar.gz: 8421d429c3869a68583227823120a89ade1304b8ae3109c4a4be8f0f3f932a93
 SHA512:
-  metadata.gz: 7005aee8a57de67b42837378285189dd3906d72dfb8db5342cc57882d9e64f428107e55962d991ceaa1d710183cf8c4daf053615978d98b2e3719c050a4a56b4
-  data.tar.gz: 3974eaf47339e51c3d3b473fb80ef53568b4e84d2aa83e45700b2a205ba9e0f20959c22664db512214b045bf1b0d17ce4ddcf6eb9f73d374fe4e829eb1fa6a5f
+  metadata.gz: f3d14ffd6009c288dc866f146e9aa88f26e1d1e1e69d45580cd4df347346b515e831078c23b7081f146af755e6d38ba28500268948b8875b23fe01d0861ede4f
+  data.tar.gz: 376071961ace632d78d96a870feac9cd9cd686aeea87dc1c9f68a9e9a839cc92ee69cfa364eadb944f71fc01ce746856a6760d029a35b51048a04c5bb255c008

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

@@ -8,15 +8,15 @@ module Effective
       # Saves a list of commit actions...
       def submits
         {}.tap do |submits|
-          if (actions.find { |a| a == :create } || actions.find { |a| a == :update })
+          if actions.find { |a| a == :create || a == :update } && EffectiveResources.default_submits['Save']
             submits['Save'] = { action: :save, default: true }
           end
 
-          if actions.find { |a| a == :index }
+          if actions.find { |a| a == :index } && EffectiveResources.default_submits['Continue']
             submits['Continue'] = { action: :save, redirect: :index, default: true, unless: -> { params[:_datatable_id].present? } }
           end
 
-          if actions.find { |a| a == :new }
+          if actions.find { |a| a == :new } && EffectiveResources.default_submits['Add New']
             submits['Add New'] = { action: :save, redirect: :new, default: true, unless: -> { params[:_datatable_id].present? } }
           end
         end

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

@@ -1,6 +1,8 @@
 module Effective
   module Resources
     module Relation
+      TARGET_LIST_LIMIT = 1500
+      TARGET_KEYS_LIMIT = 30000
 
       def relation
         @relation ||= klass.where(nil)
@@ -254,7 +256,7 @@ module Effective
         # Order the target model for its matching records / keys
         sort_column = (sort unless sort == true) || resource.sort_column
 
-        relation = resource.order(sort_column, direction, limit: limit, reorder: true).limit(1500)
+        relation = resource.order(sort_column, direction, limit: limit, reorder: true)
 
         if association.options[:as] # polymorphic
           relation = relation.where(association.type => klass.name)
@@ -270,19 +272,19 @@ module Effective
           key = sql_column(klass.primary_key)
 
           source = "#{association.join_table}.#{association.source_reflection.association_foreign_key}"
-          values = relation.pluck(association.source_reflection.klass.primary_key).uniq.compact # The searched keys
+          values = relation.limit(TARGET_LIST_LIMIT).pluck(association.source_reflection.klass.primary_key).uniq.compact # The searched keys
 
           keys = klass.joins(association.name)
-            .order(values.uniq.compact.map { |value| "#{source}=#{value} DESC" }.join(','))
+            .order(order_by_array_position(values, source))
             .pluck(klass.primary_key)
         elsif association.macro == :has_many && association.options[:through].present?
           key = sql_column(klass.primary_key)
 
           source = association.source_reflection.foreign_key
-          values = relation.pluck(association.source_reflection.klass.primary_key).uniq.compact # The searched keys
+          values = relation.limit(TARGET_LIST_LIMIT).pluck(association.source_reflection.klass.primary_key).uniq.compact # The searched keys
 
           keys = association.through_reflection.klass
-            .order(values.uniq.compact.map { |value| "#{source}=#{value} DESC" }.join(','))
+            .order(order_by_array_position(values, source))
             .pluck(association.through_reflection.foreign_key)
         elsif association.macro == :has_many
           key = sql_column(klass.primary_key)
@@ -292,7 +294,18 @@ module Effective
           keys = relation.pluck(association.foreign_key)
         end
 
-        Arel.sql(keys.uniq.compact.map { |value| "#{key}=#{value} DESC" }.join(','))
+        order_by_array_position(keys, key)
+      end
+
+      def order_by_array_position(keys, field)
+        keys = Array(keys).uniq.compact
+
+        if postgres?
+          Arel.sql("array_position(ARRAY[#{keys.first(TARGET_KEYS_LIMIT).join(',')}]::text::int[], #{field}::int)")
+        else
+          Arel.sql(keys.first(TARGET_LIST_LIMIT).map { |value| "#{key}=#{value} DESC" }.join(','))
+        end
+
       end
 
     end

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

@@ -71,7 +71,7 @@ module Effective
       def sort_column
         return @_sort_column if @_sort_column
 
-        ['name', 'title', 'label', 'subject', 'full_name', 'first_name', 'email', 'description'].each do |name|
+        ['name', 'title', 'label', 'subject', 'full_name', 'first_name', 'email', 'number', 'description'].each do |name|
           return name if column_names.include?(name)
         end
 

data/config/effective_resources.rb

@@ -21,4 +21,11 @@ EffectiveResources.setup do |config|
   # end
   config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
 
+  # These default submit actions will be added to each controller
+  # and rendered when calling effective_submit(f)
+  # based on the controller, and its `submits` if any.
+  #
+  # Supported values: 'Save', 'Continue', and 'Add New'
+  config.default_submits = ['Save', 'Continue', 'Add New']
+
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.3.4'.freeze
+  VERSION = '1.3.5'.freeze
 end

data/lib/effective_resources.rb

@@ -5,6 +5,7 @@ module EffectiveResources
 
   # The following are all valid config keys
   mattr_accessor :authorization_method
+  mattr_accessor :default_submits
 
   def self.setup
     yield self
@@ -26,4 +27,11 @@ module EffectiveResources
   def self.authorize!(controller, action, resource)
     raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
+
+  def self.default_submits
+    @_default_submits ||= begin
+      (['Save', 'Continue', 'Add New'] & Array(@@default_submits)).inject({}) { |h, v| h[v] = true; h }
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails