avo 0.5.0.beta5 → 0.5.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ed4bc1c98f78365b9b2a50dda9ed809b6c598c2d0b745e6f706f3456974532
-  data.tar.gz: 71cf2d32d71b19316e36cc2e4a7688d2581f668044ac2975a786c3ce753b11a9
+  metadata.gz: feb0f2107251ad2cef1a10c6980d4ffecde53332b8c584697ebcefb2f341edb5
+  data.tar.gz: 49d8bedcfd86bfdb44e8426c393e485451020ca5825528948a199af78f722995
 SHA512:
-  metadata.gz: 19ecbf7fb7b632eb4e00d17c88eff0f613ed03051f9b527313515b953c31c847f6328a4faa58ae6a2eb87ceab94ab62cf4be3c0d89efd6f74669fa403bb73b74
-  data.tar.gz: 61d6eef278896616b12cc4b3d3b996de8068ba93e7017a06885871f7d8a15b365621762360c2577ec5691cd37ab643a8e34318efc7be3ee99429e38ce6947dc8
+  metadata.gz: c5fc2c13d27849cc5c7b5456b9bbb1dea9798f8209746e38cc1d26cbd8f7cd158beab29c8407be0eca1cd0feedc4bfb03a8290941b9a5e66d55dc300cffada06
+  data.tar.gz: cd2c38578315087e25b5584de1145bba9bb0454c301f8587ad620f1799158dcddab644e6a8d73677a463b8d344f082cba93aaf53fd2e5a5d1cc9a0a2b0573ff4

data/Gemfile

@@ -118,8 +118,6 @@ gem 'httparty'
 
 gem 'iso'
 
-gem 'i18n-js'
-
 gem 'hotwire-rails'
 
 gem 'active_link_to'

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta5)
+    avo (0.5.0.beta6)
       active_link_to
       countries
       hotwire-rails
       httparty
-      i18n-js
       image_processing
       inline_svg
       pagy
@@ -144,8 +143,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.8.0)
-      i18n (>= 0.6.6)
     i18n_data (0.10.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -368,7 +365,6 @@ DEPENDENCIES
   gem-release
   hotwire-rails
   httparty
-  i18n-js
   image_processing (~> 1.2)
   inline_svg
   iso

data/app/controllers/avo/actions_controller.rb

@@ -35,7 +35,6 @@ module Avo
 
         @action = action_class.new
         @action.hydrate(model: model, resource: resource, user: _current_user)
-        @action.boot_fields request
       end
 
       def respond(response)

data/app/controllers/avo/base_controller.rb

@@ -196,12 +196,7 @@ module Avo
         end
 
         @actions = @resource.get_actions.map do |action|
-          action = action.new
-
-          action.hydrate(model: model, resource: @resource)
-          action.boot_fields request
-
-          action
+          action.new.hydrate(model: model, resource: @resource)
         end
       end
 

data/avo.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'countries'
   spec.add_dependency 'pundit'
   spec.add_dependency 'httparty'
-  spec.add_dependency 'i18n-js'
   spec.add_dependency 'active_link_to'
   spec.add_dependency 'image_processing'
   spec.add_dependency 'view_component'

data/lib/avo/base_action.rb

@@ -1,33 +1,39 @@
 module Avo
   class BaseAction
     class_attribute :name, default: self.class.to_s.demodulize.underscore.humanize(keep_id_suffix: true)
-    class_attribute :message, default: I18n.t('avo.are_you_sure_you_want_to_run_this_option')
-    class_attribute :confirm_text, default: I18n.t('avo.run')
-    class_attribute :cancel_text, default: I18n.t('avo.cancel')
+    class_attribute :message
+    class_attribute :confirm_text
+    class_attribute :cancel_text
     class_attribute :no_confirmation, default: false
+    class_attribute :fields_loader
 
     attr_accessor :response
     attr_accessor :model
     attr_accessor :resource
     attr_accessor :user
 
-    attr_accessor :field_loader
+    class << self
+      def fields(&block)
+        self.fields_loader ||= Avo::Loaders::FieldsLoader.new
 
-    alias :field :field_loader
-    alias :f :field
+        yield(fields_loader)
+      end
+
+      def context
+        App.context
+      end
+    end
 
     def initialize
-      @fields ||= []
+      self.class.message ||= I18n.t('avo.are_you_sure_you_want_to_run_this_option')
+      self.class.confirm_text ||= I18n.t('avo.run')
+      self.class.cancel_text ||= I18n.t('avo.cancel')
+
       @response ||= {}
       @response[:message_type] ||= :notice
       @response[:message] ||= I18n.t('avo.action_ran_successfully')
     end
 
-    def boot_fields(request)
-      @field_loader = Avo::Loaders::FieldsLoader.new
-      fields request if self.respond_to? :fields
-    end
-
     def get_fields(view_type: :table)
       get_field_definitions.map do |field|
         field.hydrate(action: self, model: @model)
@@ -38,7 +44,9 @@ module Avo
     end
 
     def get_field_definitions
-      @field_loader.bag.map do |field|
+      return [] if self.class.fields_loader.blank?
+
+      self.class.fields_loader.bag.map do |field|
         field.hydrate(action: self)
       end
     end

data/lib/avo/base_resource.rb

@@ -125,6 +125,8 @@ module Avo
     end
 
     def get_field_definitions
+      return [] if self.class.fields_loader.blank?
+
       self.class.fields_loader.bag.map do |field|
         field.hydrate(resource: self, panel_name: default_panel_name, user: user)
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = '0.5.0.beta5'
+  VERSION = '0.5.0.beta6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta5
+  version: 0.5.0.beta6
 platform: ruby
 authors:
 - Adrian Marin
@@ -123,20 +123,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n-js
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement