avo 3.0.6 → 3.0.8

data/app/components/avo/field_wrapper_component.rb

@@ -36,6 +36,7 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
     @full_width = full_width
     @label = label
     @resource = resource
+    @action = field.action
     @short = short
     @stacked = stacked
     @style = style
@@ -73,9 +74,11 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
 
     # Add the built-in stimulus integration data tags.
     if @resource.present?
-      @resource.get_stimulus_controllers.split(" ").each do |controller|
-        attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
-      end
+      add_stimulus_attributes_for(@resource, attributes)
+    end
+
+    if @action.present?
+      add_stimulus_attributes_for(@action, attributes)
     end
 
     # Fetch the data attributes off the html option
@@ -109,4 +112,12 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   def full_width?
     @full_width
   end
+
+  private
+
+  def add_stimulus_attributes_for(entity, attributes)
+    entity.get_stimulus_controllers.split(" ").each do |controller|
+      attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
+    end
+  end
 end

data/app/components/avo/fields/belongs_to_field/edit_component.html.erb

@@ -81,12 +81,14 @@
                 <%= @form.hidden_field @field.id_input_foreign_key %>
               <% end %>
             <% end %>
-            <% create_href = create_path(Avo.resource_manager.get_resource_by_model_class(type.to_s)) %>
-            <% if !disabled && create_href.present? %>
-              <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
-                          create_href,
-                          class: "text-sm"
-              %>
+            <% if field.can_create? %>
+              <% create_href = create_path(Avo.resource_manager.get_resource_by_model_class(type.to_s)) %>
+              <% if !disabled && create_href.present? %>
+                <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
+                            create_href,
+                            class: "text-sm"
+                %>
+              <% end %>
             <% end %>
           <% end %>
         </div>
@@ -125,8 +127,10 @@
           <%= @form.hidden_field @field.id_input_foreign_key %>
         <% end %>
       <% end %>
-      <% if !disabled && create_path.present? %>
-        <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
+      <% if field.can_create? %>
+        <% if !disabled && create_path.present? %>
+          <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
+        <% end %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/avo/fields/hidden_field/edit_component.html.erb

@@ -1,5 +1,6 @@
 <%= @form.hidden_field @field.id,
   class: @field.get_html(:classes, view: view, element: :input),
   data: @field.get_html(:data, view: view, element: :input),
-  style: @field.get_html(:style, view: view, element: :input)
+  style: @field.get_html(:style, view: view, element: :input),
+  value: @field.value
 %>

data/app/components/avo/index/table_row_component.html.erb

@@ -1,6 +1,6 @@
 <%# hover:z-[21] removed from tr class to solve flickering actions component on row controls and z-20 changed to z-21%>
 <tr
-  class="bg-white hover:bg-gray-50 hover:shadow-row relative z-21 border-b"
+  class="bg-white hover:bg-gray-50 hover:shadow-row z-21 border-b"
   data-component-name="<%= self.class.to_s.underscore %>"
   <%== item_selector_init @resource %>
   data-resource-name="<%= @resource.class.to_s %>"

data/app/controllers/avo/actions_controller.rb

@@ -26,7 +26,8 @@ module Avo
         fields: action_params[:fields].except(:avo_resource_ids, :avo_selected_query),
         current_user: _current_user,
         resource: resource,
-        query: decrypted_query || @resource.find_record(resource_ids, params: params)
+        query: decrypted_query ||
+          (resource_ids.any? ? @resource.find_record(resource_ids, params: params) : [])
       )
 
       respond performed_action.response

data/app/helpers/avo/resources_helper.rb

@@ -46,6 +46,7 @@ module Avo
         type: "checkbox",
         name: t("avo.select_item"),
         title: t("avo.select_item"),
+        autocomplete: :off,
         class: "mx-3 rounded checked:bg-primary-400 focus:checked:!bg-primary-400 #{floating ? "absolute inset-auto left-0 mt-3 z-10 hidden group-hover:block checked:block" : ""} #{size.to_sym == :lg ? "w-5 h-5" : "w-4 h-4"}",
         data: {
           action: 'input->item-selector#toggle input->item-select-all#selectRow',
@@ -59,6 +60,7 @@ module Avo
         type: "checkbox",
         name: t("avo.select_all"),
         title: t("avo.select_all"),
+        autocomplete: :off,
         class: "mx-3 rounded w-4 h-4 checked:bg-primary-400 focus:checked:!bg-primary-400",
         data: {
           action: "input->item-select-all#toggle",

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

@@ -1,6 +1,6 @@
 <%= turbo_frame_tag "actions_show" do %>
   <div
-    data-controller="action"
+    data-controller="<%= ["action", @action.get_stimulus_controllers].join(" ") %>"
     data-no-confirmation="<%= @action.no_confirmation %>"
     data-action-target="controllerDiv"
     data-resource-name="<%= @resource.model_key %>"
@@ -28,7 +28,7 @@
         <div class="mt-4 -mx-6">
           <% @action.get_fields.each_with_index do |field, index| %>
             <%= render field
-              .hydrate(resource: @resource, record: @resource.record, user: @resource.user, view: @view)
+              .hydrate(resource: @resource, record: @resource.record, user: @resource.user, view: @view, action: @action)
               .component_for_view(@view)
               .new(field: field, resource: @resource, index: index, form: form, compact: true)
             %>

data/avo.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.post_install_message = "Thank you for using Avo 💪  Docs are available at https://docs.avohq.io"
 
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock", "tailwind.preset.js", "tailwind.custom.js"]
-  spec.files.reject! { |file_name| %w[avo.custom.js avo.custom.js.map].any? { |rejected_file| file_name.include? rejected_file } }
+  spec.files.reject! { |file_name| %w[application.js application.js.map avo.custom.js avo.custom.js.map].any? { |rejected_file| file_name.include? rejected_file } }
 
   spec.add_dependency "activerecord", ">= 6.1"
   spec.add_dependency "activesupport", ">= 6.1"

data/lib/avo/base_action.rb

@@ -1,6 +1,7 @@
 module Avo
   class BaseAction
     include Avo::Concerns::HasItems
+    include Avo::Concerns::HasActionStimulusControllers
 
     class_attribute :name, default: nil
     class_attribute :message

data/lib/avo/base_resource.rb

@@ -6,7 +6,7 @@ module Avo
     include Avo::Concerns::HasItems
     include Avo::Concerns::CanReplaceItems
     include Avo::Concerns::HasControls
-    include Avo::Concerns::HasStimulusControllers
+    include Avo::Concerns::HasResourceStimulusControllers
     include Avo::Concerns::ModelClassConstantized
     include Avo::Concerns::HasDescription
     include Avo::Concerns::HasHelpers

data/lib/avo/concerns/has_action_stimulus_controllers.rb

@@ -0,0 +1,15 @@
+module Avo
+  module Concerns
+    module HasActionStimulusControllers
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :stimulus_controllers, default: ""
+      end
+
+      def get_stimulus_controllers
+        self.class.stimulus_controllers
+      end
+    end
+  end
+end

data/lib/avo/concerns/{has_stimulus_controllers.rb → has_resource_stimulus_controllers.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Concerns
-    module HasStimulusControllers
+    module HasResourceStimulusControllers
       extend ActiveSupport::Concern
 
       included do

data/lib/avo/configuration.rb

@@ -6,6 +6,7 @@ module Avo
     attr_writer :branding
     attr_writer :root_path
     attr_writer :cache_store
+    attr_writer :logger
     attr_accessor :timezone
     attr_accessor :per_page
     attr_accessor :per_page_steps
@@ -97,6 +98,7 @@ module Avo
       @resource_parent_controller = "Avo::ResourcesController"
       @mount_avo_engines = true
       @cache_store = computed_cache_store
+      @logger = default_logger
     end
 
     def current_user_method(&block)
@@ -193,6 +195,25 @@ module Avo
         end
       }
     end
+
+    def logger
+      Avo::ExecutionContext.new(target: @logger).handle
+    end
+
+    def default_logger
+      -> {
+        file_logger = ActiveSupport::Logger.new(Rails.root.join("log", "avo.log"))
+
+        file_logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+        file_logger.formatter = proc do |severity, time, progname, msg|
+          "[Avo] #{time}: #{msg}\n".tap do |i|
+            puts i
+          end
+        end
+
+        file_logger
+      }
+    end
   end
 
   def self.configuration

data/lib/avo/fields/base_field.rb

@@ -80,6 +80,7 @@ module Avo
         @stacked = args[:stacked] || nil
         @for_presentation_only = args[:for_presentation_only] || false
         @resource = args[:resource]
+        @action = args[:action]
         @components = args[:components] || {}
 
         @args = args

data/lib/avo/fields/belongs_to_field.rb

@@ -83,6 +83,7 @@ module Avo
         @polymorphic_help = args[:polymorphic_help]
         @target = args[:target]
         @use_resource = args[:use_resource] || nil
+        @can_create = args[:can_create].nil? ? true : args[:can_create]
       end
 
       def value
@@ -264,6 +265,10 @@ module Avo
         super
       end
 
+      def can_create?
+        @can_create
+      end
+
       private
 
       def get_model_class(model)

data/lib/avo/fields/concerns/has_html_attributes.rb

@@ -30,7 +30,10 @@ module Avo
             default_attribute_value name
           end
 
-          add_default_data_attributes attributes, name, element, view
+          add_action_data_attributes(attributes, name, element)
+          add_resource_data_attributes(attributes, name, element, view)
+
+          attributes
         end
 
         private
@@ -50,18 +53,17 @@ module Avo
           name == :data ? {} : ""
         end
 
-        def add_default_data_attributes(attributes, name, element, view)
-          if !attributes.nil? && name == :data && element == :input && view.in?([:edit, :new]) && resource.present? && resource.respond_to?(:get_stimulus_controllers)
-            extra_attributes = resource.get_stimulus_controllers
-              .split(" ")
-              .map do |controller|
-                [:"#{controller}-target", "#{id.to_s.underscore}_#{type.to_s.underscore}_input".camelize(:lower)]
-              end
-              .to_h
+        def add_action_data_attributes(attributes, name, element)
+          if can_add_stimulus_attributes_for?(action, attributes, name, element)
+            attributes.merge!(stimulus_attributes_for(action))
+          end
+        end
 
-            attributes.merge extra_attributes
-          else
-            attributes
+        def add_resource_data_attributes(attributes, name, element, view)
+          if can_add_stimulus_attributes_for?(resource, attributes, name, element) && view.in?([:edit, :new])
+            resource_stimulus_attributes = stimulus_attributes_for(resource)
+
+            attributes.merge!(resource_stimulus_attributes)
           end
         end
 
@@ -106,6 +108,19 @@ module Avo
 
           result if result.present?
         end
+
+        def can_add_stimulus_attributes_for?(entity, attributes, name, element)
+          !attributes.nil? && name == :data && element == :input && entity.present? && entity.respond_to?(:get_stimulus_controllers)
+        end
+
+        def stimulus_attributes_for(entity)
+          entity.get_stimulus_controllers
+            .split(" ")
+            .map do |controller|
+              [:"#{controller}-target", "#{id.to_s.underscore}_#{type.to_s.underscore}_input".camelize(:lower)]
+            end
+            .to_h
+        end
       end
     end
   end

data/lib/avo/version.rb

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

data/lib/avo.rb

@@ -49,8 +49,8 @@ module Avo
     delegate :license, :app, :error_manager, :tool_manager, :resource_manager, to: Avo::Current
 
     def boot
-      boot_logger
-      boot_fields
+      @logger = Avo.configuration.logger
+      @field_manager = Avo::Fields::FieldManager.build
       @cache_store = Avo.configuration.cache_store
       plugin_manager.boot_plugins
       Avo.run_load_hooks(:boot, self)
@@ -124,25 +124,6 @@ module Avo
         mount Avo::Pro::Engine, at: "/avo-pro" if defined?(Avo::Pro::Engine)
       }
     end
-
-    private
-
-    def boot_logger
-      file_logger = ActiveSupport::Logger.new(Rails.root.join("log", "avo.log"))
-
-      file_logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-      file_logger.formatter = proc do |severity, time, progname, msg|
-        "[Avo] #{time}: #{msg}\n".tap do |i|
-          puts i
-        end
-      end
-
-      @logger = file_logger
-    end
-
-    def boot_fields
-      @field_manager = Avo::Fields::FieldManager.build
-    end
   end
 end
 

data/lib/generators/avo/templates/action.tt

@@ -8,8 +8,8 @@ class Avo::Actions::<%= class_name.camelize %> < Avo::BaseAction
   #   # Add Action fields here
   # end
 
-  def handle(records:, fields:, current_user:, resource:, **args)
-    records.each do |record|
+  def handle(query:, fields:, current_user:, resource:, **args)
+    query.each do |record|
       # Do something with your records.
     end
   end

data/lib/generators/avo/templates/cards/chartkick_card.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Cards::ChartkickCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.chart_type = :area_chart

data/lib/generators/avo/templates/cards/chartkick_card_sample.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Cards::ChartkickCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.chart_type = :area_chart

data/lib/generators/avo/templates/cards/metric_card.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::MetricCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Cards::MetricCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
 

data/lib/generators/avo/templates/cards/metric_card_sample.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::MetricCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Cards::MetricCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   # self.description = "Some description"

data/lib/generators/avo/templates/cards/partial_card.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::PartialCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Cards::PartialCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.partial = "avo/cards/<%= name.underscore %>"

data/lib/generators/avo/templates/cards/partial_card_sample.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::PartialCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Cards::PartialCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.partial = "avo/cards/<%= name.underscore %>"

data/lib/generators/avo/templates/initializer/avo.tt

@@ -64,6 +64,20 @@ Avo.configure do |config|
   ## provide a lambda to enable or disable cache_resource_filters per user/resource.
   # config.cache_resource_filters = -> { current_user.cache_resource_filters? }
 
+  ## == Logger ==
+  # config.logger = -> {
+  #   file_logger = ActiveSupport::Logger.new(Rails.root.join("log", "avo.log"))
+  #
+  #   file_logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+  #   file_logger.formatter = proc do |severity, time, progname, msg|
+  #     "[Avo] #{time}: #{msg}\n".tap do |i|
+  #       puts i
+  #     end
+  #   end
+  #
+  #   file_logger
+  # }
+
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
   # config.timezone = 'UTC'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.8
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -234,8 +234,6 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- app/assets/builds/application.js
-- app/assets/builds/application.js.map
 - app/assets/builds/avo.base.css
 - app/assets/builds/avo.base.js
 - app/assets/builds/avo.base.js.map
@@ -1634,7 +1632,6 @@ files:
 - app/helpers/avo/url_helpers.rb
 - app/javascript/avo.base.js
 - app/javascript/js/active-storage.js
-- app/javascript/js/application.js
 - app/javascript/js/controllers.js
 - app/javascript/js/controllers/action_controller.js
 - app/javascript/js/controllers/actions_overflow_controller.js
@@ -1751,12 +1748,13 @@ files:
 - lib/avo/concerns/breadcrumbs.rb
 - lib/avo/concerns/can_replace_items.rb
 - lib/avo/concerns/filters_session_handler.rb
+- lib/avo/concerns/has_action_stimulus_controllers.rb
 - lib/avo/concerns/has_controls.rb
 - lib/avo/concerns/has_description.rb
 - lib/avo/concerns/has_helpers.rb
 - lib/avo/concerns/has_item_type.rb
 - lib/avo/concerns/has_items.rb
-- lib/avo/concerns/has_stimulus_controllers.rb
+- lib/avo/concerns/has_resource_stimulus_controllers.rb
 - lib/avo/concerns/hydration.rb
 - lib/avo/concerns/is_resource_item.rb
 - lib/avo/concerns/is_visible.rb

data/app/assets/builds/application.js

@@ -1,2 +0,0 @@
-(()=>{})();
-//# sourceMappingURL=application.js.map

data/app/assets/builds/application.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

data/app/javascript/js/application.js

@@ -1,19 +0,0 @@
-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()
-
-// Configure Stimulus development experience
-application.debug = window?.localStorage.getItem('avo.debug')
-window.Stimulus = application
-
-// Register stimulus-components controller
-application.register('alert', Alert)
-application.register('popover', Popover)
-
-export { application }