avo 2.43.0 → 2.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46a221f03c28ba77e3a9ab32d841176eb9ecf7125161742ad0e1c222063d1b0
-  data.tar.gz: 53a6aced2acfe8347472915e2d1c757ab7125b4189c333b1a849b23e51e306f5
+  metadata.gz: 6b2cdd36d7332c119809608975ea38e68d2bfe09987e9203b9f39149292885a7
+  data.tar.gz: 9e00cbe1f725979bf1c61164ae0912e20eff340ff727b4eb27c7212ed1500897
 SHA512:
-  metadata.gz: 6c911463f13e7556ac9a9340ab45d67e18ee9130a542d5d12db3d728dbf62e4abe74f09ffc6cf9bfb4fa5b578396461715ba47ffc2a006680a6460ec25e748bd
-  data.tar.gz: 7399602dd68b5442f19ed38a483373c95cde447a43fba2108e6e3e76905888f547841fd81675700c7467d0f035aab5a5563cc2a870ced29faf74581818266396
+  metadata.gz: 6fd7ac16fac942d14da9c82317a0f8c322cdd0b1af785319c4cc273badd5e528a73c0f87e8b12bf8673fe35e8c6cfe61ac3f578b044797e64cb1c7c3158de677
+  data.tar.gz: 87a8e856ca13470d32119b71685300dc1759f6455fc86742284e1e41f573500bb016bf0105e6e3fce48f0362a50d06f0905660d681a7345987afd5827a4ed7ff

data/Gemfile

@@ -167,3 +167,5 @@ gem "image_processing", "~> 1.12"
 gem "prefixed_ids"
 
 gem "mapkick-rb", "~> 0.1.4"
+
+gem "turbo_power", "~> 0.5.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.43.0)
+    avo (2.44.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -13,6 +13,7 @@ PATH
       meta-tags
       pagy
       turbo-rails
+      turbo_power (~> 0.5.0)
       view_component (>= 2.54.0)
       zeitwerk (>= 2.6.2)
 
@@ -419,6 +420,8 @@ GEM
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
+    turbo_power (0.5.0)
+      turbo-rails (~> 1.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
@@ -518,6 +521,7 @@ DEPENDENCIES
   sprockets-rails
   standard
   test-prof
+  turbo_power (~> 0.5.0)
   tzinfo-data
   web-console (>= 3.3.0)
   webdrivers (>= 5.3.0)

data/app/controllers/avo/actions_controller.rb

@@ -16,7 +16,6 @@ module Avo
       @view = :new
 
       @resource.hydrate(model: @model, view: @view, user: _current_user, params: params)
-      @model = ActionModel.new @action.get_attributes_for_action
     end
 
     def handle
@@ -79,19 +78,18 @@ module Avo
       end
 
       respond_to do |format|
-        format.html do
+        format.turbo_stream do
           # Flash the messages collected from the action
           flash_messages messages
 
           if response[:type] == :redirect
-            path = response[:path]
-
-            if path.respond_to? :call
-              path = instance_eval(&path)
-            end
-
-            redirect_to path, **{allow_other_host: response[:allow_other_host], status: response[:status]}.compact
-          elsif response[:type] == :reload
+            render turbo_stream: turbo_stream.redirect_to(
+              Avo::ExecutionContext.new(target: response[:path]).handle,
+              nil,
+              response[:redirect_args][:turbo_frame],
+              **response[:redirect_args].except(:turbo_frame)
+            )
+          else
             redirect_back fallback_location: resources_path(resource: @resource)
           end
         end

data/app/javascript/js/application.js

@@ -2,6 +2,9 @@ import 'mapkick/bundle'
 
 import { Alert, Popover } from 'tailwindcss-stimulus-components'
 import { Application } from '@hotwired/stimulus'
+import TurboPower from 'turbo_power'
+
+TurboPower.initialize(Turbo.StreamActions)
 
 const application = Application.start()
 

data/app/views/avo/actions/show.html.erb

@@ -7,8 +7,7 @@
     data-resource-id="<%= params[:id] %>"
     class="hidden text-slate-800"
   >
-    <%= form_with model: @model,
-      scope: 'fields',
+    <%= form_with scope: 'fields',
       url: Avo::Services::URIService.parse(@resource.records_path).append_paths("actions").to_s,
       local: true,
       data: @action.class.form_data_attributes do |form|

data/avo.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "active_link_to"
   spec.add_dependency "view_component", ">= 2.54.0"
   spec.add_dependency "turbo-rails"
+  spec.add_dependency "turbo_power", "~> 0.5.0"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "dry-initializer"

data/lib/avo/base_action.rb

@@ -7,22 +7,18 @@ module Avo
     class_attribute :confirm_button_label
     class_attribute :cancel_button_label
     class_attribute :no_confirmation, default: false
-    class_attribute :model
-    class_attribute :view
-    class_attribute :user
-    class_attribute :resource
     class_attribute :standalone, default: false
     class_attribute :visible
     class_attribute :may_download_file, default: false
     class_attribute :turbo
 
+    attr_accessor :view
     attr_accessor :response
     attr_accessor :model
     attr_accessor :resource
     attr_accessor :user
     attr_reader :arguments
 
-    delegate :view, to: :class
     delegate :context, to: ::Avo::App
     delegate :current_user, to: ::Avo::App
     delegate :params, to: ::Avo::App
@@ -59,10 +55,10 @@ module Avo
     end
 
     def initialize(model: nil, resource: nil, user: nil, view: nil, arguments: {})
-      self.class.model = model
-      self.class.resource = resource
-      self.class.user = user
-      self.class.view = view
+      @model = model
+      @resource = resource
+      @user = user
+      @view = view
       @arguments = arguments
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
@@ -75,23 +71,12 @@ module Avo
 
     def get_message
       if self.class.message.respond_to? :call
-        Avo::Hosts::ResourceRecordHost.new(block: self.class.message, record: self.class.model, resource: self.class.resource).handle
+        Avo::Hosts::ResourceRecordHost.new(block: self.class.message, record: @model, resource: @resource).handle
       else
         self.class.message
       end
     end
 
-    def get_attributes_for_action
-      get_fields.map do |field|
-        default_value = if field.default.respond_to? :call
-          Avo::Hosts::ResourceViewRecordHost.new(block: field.default, record: self.class.model, view: view, resource: self.class.resource).handle
-        else
-          field.default
-        end
-        [field.id, field.value || default_value]
-      end.to_h
-    end
-
     def handle_action(**args)
       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.
@@ -144,8 +129,8 @@ module Avo
         block: visible,
         params: params,
         parent_resource: parent_resource,
-        resource: self.class.resource,
-        view: self.class.view,
+        resource: @resource,
+        view: @view,
         arguments: arguments
       ).handle
     end
@@ -197,10 +182,9 @@ module Avo
       self
     end
 
-    def redirect_to(path = nil, allow_other_host: nil, status: nil, &block)
+    def redirect_to(path = nil, **args, &block)
       response[:type] = :redirect
-      response[:allow_other_host] = allow_other_host
-      response[:status] = status
+      response[:redirect_args] = args
       response[:path] = if block.present?
         block
       else

data/lib/avo/fields/base_field.rb

@@ -99,14 +99,20 @@ module Avo
         except_on args[:except_on] if args[:except_on].present?
       end
 
-      def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)
-        @model = model if model.present?
-        @view = view if view.present?
-        @resource = resource if resource.present?
-        @action = action if action.present?
-        @user = user if user.present?
-        @panel_name = panel_name if panel_name.present?
+      def hydrate(**kwargs)
+        # List of permitted keyword argument keys as symbols
+        permited_kwargs_keys = %i[model resource action view panel_name user]
 
+        # Check for unrecognized keys
+        unrecognized_keys = kwargs.keys - permited_kwargs_keys
+        raise ArgumentError, "Unrecognized argument(s): #{unrecognized_keys.join(', ')}" if unrecognized_keys.any?
+
+        # Set instance variables with provided values
+        kwargs.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
+
+        # Return self for method chaining, if desired
         self
       end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.43.0" unless const_defined?(:VERSION)
+  VERSION = "2.44.0" unless const_defined?(:VERSION)
 end