avo 3.11.8 → 3.11.9

data/app/assets/config/avo_manifest.js

@@ -1,4 +1,3 @@
 //= link_directory ../images/avo
 //= link_directory ../svgs
 //= link_tree ../builds
-//= link avo-rhino_field

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

@@ -10,7 +10,7 @@
       } do %>
       <% @resources.each_with_index do |resource, index| %>
         <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_record) do %>
-          <%= render(Avo::Index::GridItemComponent.new(resource: resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, actions: actions)) %>
+          <%= render(resource.resolve_component(Avo::Index::GridItemComponent).new(resource: resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, actions: actions)) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -5,7 +5,7 @@
     </div>
     <% if render_table? %>
       <div class="overflow-auto <%= table_component_order_class %>">
-        <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
+        <%= render(@resource.resolve_component(Avo::Index::ResourceTableComponent).new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
       </div>
     <% end %>
   </div>

data/app/components/avo/index/resource_table_component.rb

@@ -71,7 +71,7 @@ class Avo::Index::ResourceTableComponent < Avo::BaseComponent
       header_fields.concat row_fields
 
       # Create a TableRowComponent instance for the resource and add it to @table_row_components
-      table_row_components << Avo::Index::TableRowComponent.new(
+      table_row_components << resource.resolve_component(Avo::Index::TableRowComponent).new(
         resource: resource,
         fields: row_fields,
         reflection: @reflection,

data/app/components/avo/index/table_row_component.rb

@@ -11,7 +11,7 @@ class Avo::Index::TableRowComponent < Avo::BaseComponent
   prop :parent_resource, _Nilable(Avo::BaseResource)
   prop :actions, _Nilable(_Array(Avo::BaseAction))
   prop :fields, _Nilable(_Array(Avo::Fields::BaseField))
-  prop :header_fields, _Nilable(_Array(Avo::Fields::BaseField))
+  prop :header_fields, _Nilable(_Array(String))
 
   def resource_controls_component
     Avo::Index::ResourceControlsComponent.new(

data/app/components/avo/views/resource_index_component.html.erb

@@ -59,7 +59,7 @@
       <% if view_type.to_sym == :table %>
         <% if @resources.present? %>
           <div class="w-full relative flex-1 flex mt-0">
-            <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query, actions: @actions)) %>
+            <%= render(@resource.resolve_component(Avo::Index::ResourceTableComponent).new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query, actions: @actions)) %>
           </div>
         <% else %>
           <%= helpers.empty_state by_association: params[:related_name].present?, view_type: view_type, add_background: true %>
@@ -70,7 +70,7 @@
      <% if view_type.to_sym == :map %>
         <% if @resources.present? %>
           <div>
-            <%= render(Avo::Index::ResourceMapComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
+            <%= render(@resource.resolve_component(Avo::Index::ResourceMapComponent).new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
           </div>
         <% else %>
           <%= helpers.empty_state by_association: params[:related_name].present?, view_type: view_type, add_background: true %>

data/app/controllers/avo/base_controller.rb

@@ -581,18 +581,14 @@ module Avo
     # Set the view component for the current view
     # It will try to use the custom component if it's set, otherwise it will use the default one
     def set_component_for(view, fallback_view: nil)
-      # Fetch the components from the resource
-      components = Avo::ExecutionContext.new(
-        target: @resource.components,
-        resource: @resource,
-        record: @record,
-        view: @view
-      ).handle
+      default_component = "Avo::Views::Resource#{(fallback_view || view).to_s.classify}Component"
+
+      # Search for the custom component by key and by class name:
+      custom_component = @resource.custom_components.dig(:"resource_#{view}_component") ||
+        @resource.custom_components.dig(default_component)
 
       # If the component is not set, use the default one
-      if (custom_component = components.dig(:"resource_#{view}_component")).nil?
-        return @component = "Avo::Views::Resource#{(fallback_view || view).to_s.classify}Component".constantize
-      end
+      return @component = default_component.constantize if custom_component.nil?
 
       # If the component is set, try to use it
       @component = custom_component.to_s.safe_constantize

data/app/helpers/avo/application_helper.rb

@@ -3,8 +3,6 @@ module Avo
     include ::Pagy::Frontend
     include Avo::ResourcesHelper
 
-    AVO_CACHED_SVGS = {}
-
     def render_license_warning(title: "", message: "", icon: "exclamation")
       render partial: "avo/sidebar/license_warning", locals: {
         title: title,
@@ -67,12 +65,9 @@ module Avo
 
       file_name = "#{file_name}.svg" unless file_name.end_with? ".svg"
 
-      inline_svg svg_path(file_name), **args
-    end
-
-    # The path shouldn't change between reboots so we can memoize the paths based on the filename.
-    def svg_path(file_name)
-      AVO_CACHED_SVGS[file_name] ||= Avo::SvgFinder.find_asset(file_name).pathname.to_s
+      with_asset_finder(::Avo::SvgFinder) do
+        inline_svg file_name, **args
+      end
     end
 
     def input_classes(extra_classes = "", has_error: false)

data/lib/avo/resources/base.rb

@@ -619,6 +619,19 @@ module Avo
         @record_param ||= @record.persisted? ? @record.to_param : nil
       end
 
+      def custom_components
+        @custom_components ||= Avo::ExecutionContext.new(
+          target: components,
+          resource: self,
+          record: @record,
+          view: @view
+        ).handle.with_indifferent_access
+      end
+
+      def resolve_component(original_component)
+        custom_components.dig(original_component.to_s)&.to_s&.safe_constantize || original_component
+      end
+
       private
 
       def flatten_keys(array)

data/lib/avo/svg_finder.rb

@@ -28,7 +28,7 @@ class Avo::SvgFinder
       Avo::Engine.root.join("app", "assets", "svgs", "heroicons", "outline", @filename),
       Avo::Engine.root.join(@filename).to_s,
       # Add all paths from Rails including engines
-      *Rails.application.assets.paths.map { |path| File.join(path, @filename) }
+      *Rails.application.config.assets&.paths&.map { |path| File.join(path, @filename) }
     ].map(&:to_s).uniq
   end
 

data/lib/avo/version.rb

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

data/public/avo-assets/avo.base.css

@@ -7346,10 +7346,6 @@ tag.tagify__tag{
   bottom:0.25rem
 }
 
-.bottom-4{
-  bottom:1rem
-}
-
 .bottom-full{
   bottom:100%
 }
@@ -7394,10 +7390,6 @@ tag.tagify__tag{
   right:0.75rem
 }
 
-.right-4{
-  right:1rem
-}
-
 .start-1{
   inset-inline-start:0.25rem
 }
@@ -7654,6 +7646,10 @@ tag.tagify__tag{
   margin-top:-1rem
 }
 
+.-mt-6{
+  margin-top:-1.5rem
+}
+
 .-mt-9{
   margin-top:-2.25rem
 }
@@ -7702,10 +7698,6 @@ tag.tagify__tag{
   margin-left:2.5rem
 }
 
-.ml-12{
-  margin-left:3rem
-}
-
 .ml-2{
   margin-left:0.5rem
 }
@@ -7722,6 +7714,10 @@ tag.tagify__tag{
   margin-left:1.5rem
 }
 
+.ml-8{
+  margin-left:2rem
+}
+
 .ml-auto{
   margin-left:auto
 }
@@ -7913,6 +7909,16 @@ tag.tagify__tag{
   height:6rem
 }
 
+.size-36{
+  width:9rem;
+  height:9rem
+}
+
+.size-48{
+  width:12rem;
+  height:12rem
+}
+
 .size-6{
   width:1.5rem;
   height:1.5rem
@@ -7966,10 +7972,6 @@ tag.tagify__tag{
   height:1.5rem
 }
 
-.h-60{
-  height:15rem
-}
-
 .h-64{
   height:16rem
 }
@@ -8066,10 +8068,6 @@ tag.tagify__tag{
   min-height:8rem
 }
 
-.min-h-dvh{
-  min-height:100dvh
-}
-
 .min-h-full{
   min-height:100%
 }
@@ -8432,10 +8430,6 @@ tag.tagify__tag{
   flex-direction:column
 }
 
-.flex-col-reverse{
-  flex-direction:column-reverse
-}
-
 .flex-wrap{
   flex-wrap:wrap
 }
@@ -9418,10 +9412,6 @@ tag.tagify__tag{
   padding-bottom:2rem
 }
 
-.pe-1{
-  padding-inline-end:0.25rem
-}
-
 .pl-1{
   padding-left:0.25rem
 }
@@ -9446,10 +9436,6 @@ tag.tagify__tag{
   padding-top:0.125rem
 }
 
-.pt-1{
-  padding-top:0.25rem
-}
-
 .pt-16{
   padding-top:4rem
 }
@@ -9928,12 +9914,6 @@ tag.tagify__tag{
   transition-duration:150ms
 }
 
-.transition-colors{
-  transition-property:color, background-color, border-color, text-decoration-color, fill, stroke;
-  transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration:150ms
-}
-
 .transition-opacity{
   transition-property:opacity;
   transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.11.8
+  version: 3.11.9
 platform: ruby
 authors:
 - Adrian Marin
@@ -222,6 +222,9 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- app/assets/builds/avo.base.css
+- app/assets/builds/avo.base.js
+- app/assets/builds/avo.base.js.map
 - app/assets/config/avo_manifest.js
 - app/assets/stylesheets/avo.base.css
 - app/assets/stylesheets/css/active-storage.css