effective_resources 1.11.0 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a57730f0c7dea924ad0f2e97691d9c165efa9d8b7bffa0b4dddefed1a5364ac3
-  data.tar.gz: a225961a1f6e45ba7ec2a510fc831c21727ac3e36b97dfdc5efe575b524226cf
+  metadata.gz: 47e241da2411f181fa4a176db6791e1416b861f38061c9186fdf595df78767e2
+  data.tar.gz: 76dc05f7974a967a14c608161e9c57e90eb66a962f32ca923b4913bd1f4f15bb
 SHA512:
-  metadata.gz: 264898b9e51e5deb83cd76dd1ef5a18b9aa3904c1fa2e5899ad4bdb5cff5b2a1563752386a28c758bd398e5c3ce69417069f0e49d8d8334e5bd9accb653960b5
-  data.tar.gz: dd7f10337d9eee419d13b5a8770929474c64bbe69d6b9c028586d0af83c739cbf4791bfa6a5e4b8972812e14edc811cd3e5d60d56a78bab29c4e970b5e42178f
+  metadata.gz: 6dc99f690d6f2aa26bfa240df5d9b5887ff4811ecf834178269934c5ef35cdd195180cc137302a2d31dee371ca5d012077f8d0113d146410d76fc9f6b06d2723
+  data.tar.gz: aebfd8aff7b492dbf304ae5be5b3c63d6432754b2272c4c77a0aff64e1685add92fa70dadc385589c56e0b55dfc430156a18a9945bdb22fa73488ec970bbba10

data/app/controllers/concerns/effective/wizard_controller/before_actions.rb

@@ -35,6 +35,20 @@ module Effective
 
       # setup_wizard from Wicked called now
 
+      # Allow only 1 in-progress wizard at a time
+      def redirect_if_existing
+        return if step == 'wicked_finish'
+        return if resource.blank?
+        return if resource.try(:done?)
+        return unless resource_scope.respond_to?(:in_progress)
+
+        existing = resource_scope.in_progress.where.not(id: resource).first
+        return unless existing.present?
+
+        flash[:success] = "You have been redirected to your in-progress wizard"
+        redirect_to resource_wizard_path(existing, existing.next_step)
+      end
+
       # before_action :enforce_can_visit_step, only: [:show, :update]
       # Make sure I have permission for this step
       def enforce_can_visit_step
@@ -76,6 +90,10 @@ module Effective
         resource.ready!
       end
 
+      def clear_flash_success
+        @_delete_flash_success = true
+      end
+
     end
   end
 end

data/app/controllers/concerns/effective/wizard_controller/permitted_params.rb

@@ -0,0 +1,19 @@
+module Effective
+  module WizardController
+    module PermittedParams
+      BLACKLIST = [
+        :created_at, :updated_at,
+        :token, :slug, :price,
+        :logged_change_ids, :orders, :purchased_order_id,
+        :status, :status_steps, :wizard_steps,
+        :submitted_at, :completed_at, :reviewed_at, :approved_at, :declined_at, :purchased_at,
+        :declined_reason
+      ]
+
+      def resource_permitted_params
+        permitted_name = params.key?(effective_resource.name) ? effective_resource.name : effective_resource.resource_name
+        params.require(permitted_name).except(BLACKLIST).permit!
+      end
+    end
+  end
+end

data/app/controllers/concerns/effective/wizard_controller.rb

@@ -7,6 +7,7 @@ module Effective
 
     include Effective::WizardController::Actions
     include Effective::WizardController::BeforeActions
+    include Effective::WizardController::PermittedParams
     include Effective::WizardController::Save
     include Effective::WizardController::WickedOverrides
 
@@ -23,10 +24,14 @@ module Effective
         before_action :assign_resource
         before_action :authorize_resource
         before_action :assign_required_steps
+
         before_action :setup_wizard # Wicked
 
         before_action :enforce_can_visit_step
 
+        before_action :redirect_if_existing, only: [:show, :new]
+        before_action :clear_flash_success, only: [:update]
+
         before_action :assign_current_step
         before_action :assign_page_title
 
@@ -42,6 +47,12 @@ module Effective
         flash[:danger] = "Unknown step. You have been moved to the #{resource_wizard_steps.first} step."
         redirect_to wizard_path(resource_wizard_steps.first)
       end
+
+      # effective_resources on save callback
+      after_action do
+        flash.clear if @_delete_flash_success
+      end
+
     end
 
     def find_wizard_resource

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -62,7 +62,7 @@ module ActsAsPurchasableWizard
     end
 
     # From Billing Step
-    order.billing_address = owner.billing_address if owner.billing_address.present?
+    order.billing_address = owner.billing_address if owner.try(:billing_address).present?
 
     # Important to add/remove anything
     order.save!

data/app/models/concerns/acts_as_wizard.rb

@@ -141,6 +141,10 @@ module ActsAsWizard
   module ClassMethods
     def acts_as_wizard?; true; end
 
+    def wizard_steps_hash
+      const_get(:WIZARD_STEPS)
+    end
+
     def all_wizard_steps
       const_get(:WIZARD_STEPS).keys
     end

data/app/models/effective/after_commit.rb

@@ -28,8 +28,10 @@ module Effective
     def self.register_callback(connection:, name:, callback:)
       raise ArgumentError, "#{name} expected a block" unless callback
 
-      raise("#{name} is useless outside transaction") unless connection.transaction_open?
-      raise("#{name} is useless outside transaction") unless connection.current_transaction.joinable?
+      in_transaction = (connection.transaction_open? && connection.current_transaction.joinable?)
+
+      # Execute immediately when outside transaction
+      return callback.call unless in_transaction
 
       after_commit = Effective::AfterCommit.new("#{name}": callback)
       connection.add_transaction_record(after_commit)

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

@@ -95,8 +95,6 @@ module Effective
             relation.where(is_null("#{sql_column}_id")).where(is_null("#{sql_column}_type"))
           elsif type.present? && id.present? # This was from a polymorphic select
             relation.where("#{sql_column}_id = ?", id).where("#{sql_column}_type = ?", type)
-          elsif name == :user # Polymorphic user
-            relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
           else # Maybe from a string field
             collection = relation.none
 
@@ -106,7 +104,7 @@ module Effective
               resource = Effective::Resource.new(klass_name)
               next unless resource.klass.present?
 
-              collection = collection.or(relation.where("#{name}_id": resource.search_any(term), "#{name}_type": klass_name))
+              collection = collection.or(relation.where("#{name}_id": resource.search_any(term, fuzzy: fuzzy), "#{name}_type": klass_name))
             end
 
             collection

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.11.0'.freeze
+  VERSION = '1.12.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,6 +145,7 @@ files:
 - app/controllers/concerns/effective/wizard_controller.rb
 - app/controllers/concerns/effective/wizard_controller/actions.rb
 - app/controllers/concerns/effective/wizard_controller/before_actions.rb
+- app/controllers/concerns/effective/wizard_controller/permitted_params.rb
 - app/controllers/concerns/effective/wizard_controller/save.rb
 - app/controllers/concerns/effective/wizard_controller/wicked_overrides.rb
 - app/helpers/effective_acts_as_email_form_helper.rb