avo 2.34.5 → 2.34.7.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a18c7280a487eda50ae3c5977eb8971606de858f3d7d166041fd197dcaba7650
-  data.tar.gz: ffe44e5efac3587842e1b41eec3dcdb74ad44de75b26b582e23b09c0ef537ca8
+  metadata.gz: bf01123b539f33d10323279e5162841e59402b07583e7c895d573a96339eb7c1
+  data.tar.gz: c2afd468f20c50b6a6f8bdfce571334315c8b217fb74cc3201cfdd45f4e77d28
 SHA512:
-  metadata.gz: 62e48f3bafebed5689634122390accc26cf500ab684c739cb58c2154e8b29c81a51abaf08867aafc397115d795e74c7eacd80dbcbdef04f4ef82aec27fba5aa3
-  data.tar.gz: 5d36a86586779c5160d48325719ee127b05e9ba733585abf91616d50a8461e95059b1dc74fc11fee4f6c8d3d64c957035f6787262e59f0bee99e132a04da2823
+  metadata.gz: 4949887f9e1aa83ce3b8d8ea7d0645b6c00a5ee91af6ae6686069a55aa4273258c8dcbca98c90d2ee4c2b2086a340f4917c79c7b1108a4cdb70628c09271c30d
+  data.tar.gz: 724fb04515d3f0fbdfa1646ce45c574f0fdc5a8461af54924fe90f205441a676c5e39a549d72c81b16fdaaf4a21a9cff985d43f94dc5e0cae3ecdece73da8a47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.34.5)
+    avo (2.34.7.pre.1)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -421,7 +421,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
-    view_component (3.1.0)
+    view_component (3.2.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

data/app/components/avo/alert_component.html.erb

@@ -10,7 +10,7 @@
       </div>
       <div class="ml-3 w-0 flex-1 pt-0.5">
         <p class="text-sm leading-5 font-semibold">
-          <%= sanitize message %>
+          <%= sanitize message.to_s %>
         </p>
       </div>
       <div class="ml-4 flex-shrink-0 flex items-center">

data/app/components/avo/field_wrapper_component.rb

@@ -41,7 +41,7 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   end
 
   def classes(extra_classes = "")
-    "field-wrapper relative flex flex-col flex-grow pb-2 md:pb-0 leading-tight min-h-14 #{stacked? ? "field-wrapper-layout-stacked" : "field-wrapper-layout-inline md:flex-row md:items-center"} #{compact? ? "field-wrapper-size-compact" : "field-wrapper-size-regular"} #{full_width? ? "field-width-full" : "field-width-regular"} #{@classes || ""} #{extra_classes || ""} #{@field.get_html(:classes, view: view, element: :wrapper)}"
+    "field-wrapper relative flex flex-col grow pb-2 md:pb-0 leading-tight min-h-14 h-full #{stacked? ? "field-wrapper-layout-stacked" : "field-wrapper-layout-inline md:flex-row md:items-center"} #{compact? ? "field-wrapper-size-compact" : "field-wrapper-size-regular"} #{full_width? ? "field-width-full" : "field-width-regular"} #{@classes || ""} #{extra_classes || ""} #{@field.get_html(:classes, view: view, element: :wrapper)}"
   end
 
   def style

data/app/components/avo/fields/file_field/index_component.rb

@@ -6,10 +6,10 @@ class Avo::Fields::FileField::IndexComponent < Avo::Fields::IndexComponent
   end
 
   def has_image_tag?
-    @field.value.attached? && @field.value.representable? && @field.is_image
+    field.value.present? && field.value.attached? && field.value.representable? && field.is_image
   end
 
   def has_audio_tag?
-    @field.value.attached? && @field.is_audio
+    field.value.present? && field.value.attached? && field.is_audio
   end
 end

data/app/components/avo/fields/index_component.rb

@@ -3,6 +3,7 @@
 class Avo::Fields::IndexComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
+  attr_reader :field
   attr_reader :parent_resource
   attr_reader :view
 

data/app/components/avo/item_switcher_component.html.erb

@@ -7,10 +7,7 @@
     <% c.with_body do %>
       <div class="divide-y">
         <% item.visible_items.each_with_index do |field, index| %>
-          <%= render field
-            .hydrate(resource: @resource, model: @resource.model, user: resource.user, view: view)
-            .component_for_view(view)
-            .new(field: field, resource: @resource, index: index, form: form) %>
+          <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
         <% end %>
       </div>
     <% end %>
@@ -19,4 +16,12 @@
   <%= render tab_group_component %>
 <% elsif item.is_field? %>
   <%= render field_component %>
+<% elsif item.is_row? %>
+  <%= render Avo::RowComponent.new do |c| %>
+    <% c.with_body do %>
+      <% item.visible_items.each_with_index do |field, index| %>
+        <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
+      <% end %>
+    <% end %>
+  <% end %>
 <% end %>

data/app/components/avo/item_switcher_component.rb

@@ -42,6 +42,7 @@ class Avo::ItemSwitcherComponent < Avo::BaseComponent
   end
 
   def field_component
-    item.component_for_view(@view).new(field: item.hydrate(resource: @resource, view: @view, model: @resource.model), resource: @resource, index: index, form: form)
+    final_item = item.dup.hydrate(resource: @resource, model: @resource.model, user: resource.user, view: view)
+    final_item.component_for_view(@view).new(field: final_item, resource: @resource, index: index, form: form)
   end
 end

data/app/components/avo/row_component.html.erb

@@ -0,0 +1,3 @@
+<div class="flex flex-col sm:flex-row min-h-14 grow shrink-0" data-component="<%= self.class %>">
+  <%= body %>
+</div>

data/app/components/avo/row_component.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Avo::RowComponent < ViewComponent::Base
+  attr_reader :classes
+
+  renders_one :body
+
+  def initialize(classes: nil, data: {})
+    @classes = classes
+    @data = data
+  end
+end

data/app/controllers/avo/application_controller.rb

@@ -235,8 +235,15 @@ module Avo
     end
 
     def eager_load_files(resource, query)
-      if resource.attached_file_fields.present?
-        resource.attached_file_fields.map do |field|
+      # Get the non-computed file fields and try to eager load them
+      attachment_fields = resource
+        .attachment_fields
+        .reject do |field|
+          field.computed
+        end
+
+      if attachment_fields.present?
+        attachment_fields.map do |field|
           attachment = case field.class.to_s
           when "Avo::Fields::FileField"
             "attachment"

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/base_resource.rb

@@ -301,7 +301,7 @@ module Avo
       view_types
     end
 
-    def attached_file_fields
+    def attachment_fields
       get_field_definitions.select do |field|
         [Avo::Fields::FileField, Avo::Fields::FilesField].include? field.class
       end

data/lib/avo/concerns/has_fields.rb

@@ -26,6 +26,12 @@ module Avo
           items_holder.panel name, **args, &block
         end
 
+        def row(**args, &block)
+          ensure_items_holder_initialized
+
+          items_holder.row(**args, &block)
+        end
+
         def tabs(**args, &block)
           ensure_items_holder_initialized
 

data/lib/avo/concerns/is_resource_item.rb

@@ -35,6 +35,10 @@ module Avo
       def is_sidebar?
         self.class.item_type == :sidebar
       end
+
+      def is_row?
+        self.class.item_type == :row
+      end
     end
   end
 end

data/lib/avo/items_holder.rb

@@ -38,6 +38,10 @@ module Avo
       add_item Avo::TabBuilder.parse_block(name: name, **args, &block)
     end
 
+    def row(**args, &block)
+      add_item Avo::RowBuilder.parse_block(**args, &block)
+    end
+
     def tool(klass, **args)
       instance = klass.new(**args)
       add_item instance

data/lib/avo/panel.rb

@@ -18,10 +18,6 @@ class Avo::Panel
     @items_holder = Avo::ItemsHolder.new
   end
 
-  def add_item(item)
-    @items << item
-  end
-
   def has_items?
     @items.present?
   end

data/lib/avo/panel_builder.rb

@@ -7,6 +7,7 @@ class Avo::PanelBuilder
 
   delegate :heading, to: :items_holder
   delegate :field, to: :items_holder
+  delegate :row, to: :items_holder
   delegate :items, to: :items_holder
 
   attr_reader :items_holder

data/lib/avo/row.rb

@@ -0,0 +1,26 @@
+class Avo::Row
+  include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::VisibleItems
+
+  class_attribute :item_type, default: :row
+
+  attr_reader :view
+  attr_accessor :items_holder
+
+  delegate :items, :add_item, to: :items_holder
+
+  def initialize(view: nil)
+    @view = view
+    @items_holder = Avo::ItemsHolder.new
+  end
+
+  def hydrate(view: nil, **args)
+    @view = view
+
+    self
+  end
+
+  def has_items?
+    @items.present?
+  end
+end

data/lib/avo/row_builder.rb

@@ -0,0 +1,24 @@
+class Avo::RowBuilder
+  class << self
+    def parse_block(**args, &block)
+      Docile.dsl_eval(new(**args), &block).build
+    end
+  end
+
+  attr_reader :items_holder
+
+  delegate :field, to: :items_holder
+  delegate :tool, to: :items_holder
+  delegate :items, to: :items_holder
+
+  def initialize(**args)
+    @row = Avo::Row.new(**args)
+    @items_holder = Avo::ItemsHolder.new
+  end
+
+  # Fetch the tab
+  def build
+    @row.items_holder = @items_holder
+    @row
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.34.5" unless const_defined?(:VERSION)
+  VERSION = "2.34.7.pre.1" unless const_defined?(:VERSION)
 end

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

@@ -6988,11 +6988,15 @@ trix-toolbar .trix-button-group:not(:first-child){
   flex-shrink:0
 }
 
+.shrink-0{
+  flex-shrink:0
+}
+
 .flex-grow-0{
   flex-grow:0
 }
 
-.flex-grow{
+.grow{
   flex-grow:1
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.34.5
+  version: 2.34.7.pre.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1565,6 +1565,8 @@ files:
 - app/components/avo/resource_component.rb
 - app/components/avo/resource_sidebar_component.html.erb
 - app/components/avo/resource_sidebar_component.rb
+- app/components/avo/row_component.html.erb
+- app/components/avo/row_component.rb
 - app/components/avo/sidebar/base_item_component.rb
 - app/components/avo/sidebar/group_component.html.erb
 - app/components/avo/sidebar/group_component.rb
@@ -1714,6 +1716,7 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1849,6 +1852,8 @@ files:
 - lib/avo/resources/controls/execution_context.rb
 - lib/avo/resources/controls/items_holder.rb
 - lib/avo/resources/controls/link_to.rb
+- lib/avo/row.rb
+- lib/avo/row_builder.rb
 - lib/avo/services/authorization_clients/nil_client.rb
 - lib/avo/services/authorization_clients/pundit_client.rb
 - lib/avo/services/authorization_service.rb
@@ -1977,9 +1982,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: