avo 3.0.0.beta1 → 3.0.0.pre1

data/lib/avo/base_action.rb

@@ -14,7 +14,6 @@ module Avo
     class_attribute :standalone, default: false
     class_attribute :visible
     class_attribute :may_download_file, default: false
-    class_attribute :turbo
 
     attr_accessor :response
     attr_accessor :record
@@ -25,9 +24,7 @@ module Avo
     delegate :view, to: :class
     # TODO: find a differnet way to delegate this to the uninitialized Current variable
     delegate :context, to: Avo::Current
-    def curent_user
-      Avo::Current.user
-    end
+    delegate :current_user, to: Avo::Current
     delegate :params, to: Avo::Current
     delegate :view_context, to: Avo::Current
     delegate :avo, to: :view_context
@@ -39,9 +36,9 @@ module Avo
       def form_data_attributes
         # We can't respond with a file download from Turbo se we disable it on the form
         if may_download_file
-          {turbo: turbo || false, remote: false, action_target: :form}
+          {turbo: false, remote: false, action_target: :form}
         else
-          {turbo: turbo, turbo_frame: :_top, action_target: :form}.compact
+          {turbo_frame: :_top, action_target: :form}
         end
       end
 
@@ -62,46 +59,32 @@ module Avo
     end
 
     def initialize(record: nil, resource: nil, user: nil, view: nil, arguments: {})
-      self.class.record = record
-      self.class.resource = resource
-      self.class.user = user
-      self.class.view = view
+      self.class.record = record if record.present?
+      self.class.resource = resource if resource.present?
+      self.class.user = user if user.present?
+      self.class.view = view if view.present?
       @arguments = arguments
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
       self.class.confirm_button_label ||= I18n.t("avo.run")
       self.class.cancel_button_label ||= I18n.t("avo.cancel")
 
-      self.items_holder = Avo::Resources::Items::Holder.new
-      fields
-
       @response ||= {}
       @response[:messages] = []
     end
 
-    # Blank method
-    def fields
-    end
-
     def get_message
       Avo::ExecutionContext.new(target: self.class.message, record: self.class.record, resource: self.class.resource).handle
     end
 
     def get_attributes_for_action
       get_fields.map do |field|
-        value = field.value || Avo::ExecutionContext.new(
-          target: field.default,
-          record: self.class.record,
-          resource: self.class.resource,
-          view: view
-        ).handle
-
-        [field.id, value]
+        [field.id, field.value || field.default]
       end.to_h
     end
 
     def handle_action(**args)
-      records, fields, current_user, resource = args.values_at(:records, :fields, :current_user, :resource)
+      models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
       # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
       action_fields = get_field_definitions.map { |field| [field.id, field] }.to_h
 
@@ -131,7 +114,7 @@ module Avo
         resource: resource
       }
 
-      args[:records] = records
+      args[:models] = models unless standalone
 
       handle(**args)
 
@@ -159,7 +142,7 @@ module Avo
     end
 
     def param_id
-      self.class.to_s
+      self.class.to_s.demodulize.underscore.tr "/", "_"
     end
 
     def succeed(text)
@@ -168,6 +151,12 @@ module Avo
       self
     end
 
+    def fail(text)
+      Rails.logger.warn "DEPRECATION WARNING: Action fail method is deprecated in favor of error method and will be removed from Avo version 3.0.0"
+
+      error text
+    end
+
     def error(text)
       add_message text, :error
 
@@ -199,10 +188,8 @@ module Avo
       self
     end
 
-    def redirect_to(path = nil, allow_other_host: nil, status: nil, &block)
+    def redirect_to(path = nil, &block)
       response[:type] = :redirect
-      response[:allow_other_host] = allow_other_host
-      response[:status] = status
       response[:path] = if block.present?
         block
       else