avo 2.37.0 → 2.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d162fb0b1c274b27a2c4e185bbc058e1e6ad2984454ebf01249701259e802eba
-  data.tar.gz: bcf8ba5a7c30007bfa696537797d04a10517a9cc7b8ce8e3aaec018101250290
+  metadata.gz: 23ddc6ba1d200de7c9597eb8aeb0d52b82f18f9321d859dd4f2089dfc11e7991
+  data.tar.gz: 8825e4520ec2c6792c3b34de9be0658cc13e4fa13bdd15e1c2930719ae98391a
 SHA512:
-  metadata.gz: f760ec5a9acf707e9c5113ee747985cf87998a88dd3bd085fcccd37703621fce0fb57bbab43bc2d0c03196dea78a3fb8b3ebb1a228c11e1c6072b2c691f99d95
-  data.tar.gz: 6f9544cd72a2b94e33254a0c359801d8a3eb6e23fe17ca42ad746614f14fee2d1c3ea838538a39e79092e0647c5e7bb3668d28cd10f1bf11eb719a9861a2e37f
+  metadata.gz: 9e0d26ced1c8bbfdb1d1c29a90e8c11ff86e038d58f985f06b2241888416b1c2d4ab13a8179229bcf39af94861b591804616312342e06ed069cd1bbdb6fb4f21
+  data.tar.gz: b2be4690bf39bee8d27fa064393b91431b38476022610e084e5f625890abd563669009d043ca9b56f57c21671ecb7c63eb7040629b3bc23c5b501b1429ff1c71

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.37.0)
+    avo (2.37.1)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -422,7 +422,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
-    view_component (3.4.0)
+    view_component (3.5.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

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

@@ -9,7 +9,7 @@
     <%= link_to helpers.svg('eye', class: button_classes),
       show_path,
       class: 'flex items-center',
-      title: t('avo.view_item', item: singular_resource_name).capitalize,
+      title: t('avo.view_item', item: singular_resource_name).humanize,
       data: {
         target: 'control:view',
         control: :show,
@@ -22,7 +22,7 @@
     <%= link_to helpers.svg('edit', class: button_classes),
       edit_path,
       class: 'flex items-center',
-      title: t('avo.edit_item', item: singular_resource_name).capitalize,
+      title: t('avo.edit_item', item: singular_resource_name).humanize,
       data: {
         target: 'control:edit',
         control: :edit,
@@ -41,7 +41,7 @@
         'data-turbo-frame': params[:turbo_frame]
       } do |form| %>
       <%= form.button helpers.svg('detach', class: button_classes),
-        title: t('avo.detach_item', item: singular_resource_name).capitalize,
+        title: t('avo.detach_item', item: singular_resource_name).humanize,
         type: :submit,
         data: {
           target: 'control:detach',
@@ -65,7 +65,7 @@
         'data-turbo-frame': params[:turbo_frame]
       } do |form| %>
       <%= form.button helpers.svg('trash', class: button_classes),
-        title: t('avo.delete_item',  item: singular_resource_name).capitalize,
+        title: t('avo.delete_item',  item: singular_resource_name).humanize,
         type: :submit,
         data: {
           target: 'control:destroy',

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

@@ -10,10 +10,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_detach?
-    @reflection.present? &&
-      @resource.model.present? &&
-      is_has_many_association &&
-      authorize_association_for(:detach)
+    is_has_many_association? ? super : false
   end
 
   def can_edit?
@@ -79,7 +76,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     ::Avo::App.get_resource_by_model_name @parent_model.class
   end
 
-  def is_has_many_association
+  def is_has_many_association?
     @reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
   end
 

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

@@ -36,6 +36,11 @@
           <%= sidebar %>
         </div>
       <% end %>
+      <% if bare_sidebar? %>
+        <div class="w-full sm:w-1/3 flex-shrink-0 h-full">
+          <%= bare_sidebar %>
+        </div>
+      <% end %>
     </div>
   <% end %>
   <% if bare_content? %>

data/app/components/avo/panel_component.rb

@@ -10,6 +10,7 @@ class Avo::PanelComponent < ViewComponent::Base
   renders_one :tools
   renders_one :body
   renders_one :sidebar
+  renders_one :bare_sidebar
   renders_one :bare_content
   renders_one :footer_tools
   renders_one :footer

data/app/components/avo/resource_component.rb

@@ -20,7 +20,14 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def can_detach?
-    authorize_association_for(:detach)
+    return false if @reflection.blank? || @resource.model.blank? || !authorize_association_for(:detach)
+
+    # If the inverse_of is a belongs_to, we need to check if it's optional in order to know if we can detach it.
+    if inverse_of.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+      inverse_of.options[:optional]
+    else
+      true
+    end
   end
 
   def detach_path
@@ -136,4 +143,19 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
     item&.hydrate(view: view)
   end
+
+  def inverse_of
+    current_reflection = @reflection.active_record.reflect_on_all_associations.find do |reflection|
+      reflection.name == @reflection.name.to_sym
+    end
+
+    inverse_of = current_reflection.inverse_of
+
+    if inverse_of.blank?
+      # Please configure the 'inverse_of' option for the ':users' association on the 'Project' model.
+      raise "Please configure the 'inverse_of' option for the '#{current_reflection.macro} :#{current_reflection.name}' association on the '#{current_reflection.active_record.name}' model."
+    end
+
+    inverse_of
+  end
 end

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

@@ -13,7 +13,7 @@
           style: :text,
           'data-turbo-frame': 'attach_modal',
           'data-target': 'attach' do %>
-          <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
+          <%= t('avo.attach_item', item: singular_resource_name).humanize %>
         <% end %>
       <% end %>
       <% if can_act_on? %>
@@ -25,7 +25,7 @@
           'data-target': 'create',
           style: :primary,
           color: :primary do %>
-          <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
+          <%= t('avo.create_new_item', item: singular_resource_name.humanize(capitalize: false) ) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -109,7 +109,7 @@
                 data: {
                   confirm: "Are you sure you want to detach this #{title}."
                 } do %>
-              <%= t('avo.detach_item', item: title).capitalize %>
+              <%= t('avo.detach_item', item: title).humanize %>
             <% end %>
           <% end %>
           <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>

data/app/controllers/avo/actions_controller.rb

@@ -55,7 +55,7 @@ module Avo
         model: @model,
         resource: @resource,
         user: _current_user,
-        view: @view,
+        view: :new, # force the action view to in order to render new-related fields (hidden field)
         arguments: @resource.get_action_arguments(action_class)
       )
     end

data/app/controllers/avo/associations_controller.rb

@@ -81,7 +81,7 @@ module Avo
       association_name = BaseResource.valid_association_name(@model, params[:related_name])
 
       if reflection_class == "HasManyReflection"
-        @model.send(association_name).delete @attachment_model
+        @model.send(association_name).destroy @attachment_model
       else
         @model.send("#{association_name}=", nil)
       end

data/lib/avo/base_resource.rb

@@ -263,7 +263,7 @@ module Avo
       return @name if @name.present?
 
       if translation_key && ::Avo::App.translation_enabled
-        t(translation_key, count: 1, default: default).capitalize
+        t(translation_key, count: 1, default: default).humanize
       else
         default
       end
@@ -277,7 +277,7 @@ module Avo
       default = name.pluralize
 
       if translation_key && ::Avo::App.translation_enabled
-        t(translation_key, count: 2, default: default).capitalize
+        t(translation_key, count: 2, default: default).humanize
       else
         default
       end

data/lib/avo/fields/base_field.rb

@@ -124,7 +124,7 @@ module Avo
         return @name if custom_name?
 
         if translation_key && ::Avo::App.translation_enabled
-          t(translation_key, count: 1, default: default_name).capitalize
+          t(translation_key, count: 1, default: default_name).humanize
         else
           default_name
         end
@@ -134,7 +134,7 @@ module Avo
         default = name.pluralize
 
         if translation_key && ::Avo::App.translation_enabled
-          t(translation_key, count: 2, default: default).capitalize
+          t(translation_key, count: 2, default: default).humanize
         else
           default
         end

data/lib/avo/resources/controls/detach_button.rb

@@ -5,7 +5,7 @@ module Avo
         def initialize(**args)
           super(**args)
 
-          @label = I18n.t("avo.detach_item", item: title).capitalize
+          @label = I18n.t("avo.detach_item", item: title).humanize
         end
       end
     end

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.37.0
+  version: 2.37.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord