avo 3.0.0.pre17 → 3.0.0.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b515703f3cde0908788e725b95e1e2a0bc99c5d16f44ed401d7965e2a96a6d7a
-  data.tar.gz: 71dc65217c6c24f775303d0a913cb59763b17762540e1941a477e138c5adf035
+  metadata.gz: a9c50d4849e253d4fbdd7aa6213feb651e764efe5cf5e4b34341f2dde7b7de18
+  data.tar.gz: 6c4a2d98de7136f1f2d4282c05870c1d2a92f2b2c56facc37c9cdf80a25a3cc7
 SHA512:
-  metadata.gz: f67a393bd801e3500280fbaf6912df360ef29a949575f8c3e1a42c7f5d2c097b2944ab8895f8135f6263d5b75eb70ef72405f6f2300d3ceae8b063ddc2299cbc
-  data.tar.gz: f18d6d995b2e70d487d929082bcefc156d6ae68cc0175189b490ec6dd801291482575c9f0a831c0d2c5a93f06ec06458d66cb0f948be1162ff4c72c4f1968fe8
+  metadata.gz: 02bcdcf818e190b9e6aa03c638f8bec67525ff4418e5c55e4f8eb4613cea9107a5151b4254a78e1c219881c1a3d1faa0cb4bacf8f38677ccfd194f434080e67f
+  data.tar.gz: b6ce2f86cbc6749edad03a442dc8c5b7c70de454845ea84754f66ac2b549af0be8b8def02abd538d1372a600264c7da1cf36e7183ec9f29c294be448ed9f0c3d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.0.pre17)
+    avo (3.0.0.pre18)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/fields/has_one_field/show_component.html.erb

@@ -11,7 +11,7 @@
           color: :primary,
           style: :text,
           'data-turbo-frame': 'attach_modal' do %>
-          <%= t('avo.attach_item', item: @field.name.downcase) %>
+          <%= t('avo.attach_item', item: @field.name.humanize(capitalize: false)) %>
         <% end %>
       <% end %>
       <% if !@field.is_readonly? && !@field.is_disabled? && can_see_the_create_button? %>
@@ -21,7 +21,7 @@
           'data-turbo-frame': '_top',
           style: :primary,
           color: :primary do %>
-          <%= t('avo.create_new_item', item: @field.name.downcase ) %>
+          <%= t('avo.create_new_item', item: @field.name.humanize(capitalize: false) ) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -13,10 +13,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_detach?
-    @reflection.present? &&
-      @resource.record.present? &&
-      is_has_many_association &&
-      authorize_association_for(:detach)
+    is_has_many_association? ? super : false
   end
 
   def can_edit?
@@ -76,7 +73,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     Avo.resource_manager.get_resource_by_model_class @parent_record.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/modal_component.html.erb

@@ -3,7 +3,7 @@
   data-modal-target="modal"
 >
   <div aria-expanded="true" class="modal-overlay absolute w-full h-full bg-opacity-25 bg-gray-800 flex justify-center items-center" data-action="click->modal#close"></div>
-  <div aria-expanded="true" role="dialog" aria-modal="true" class="modal-body rounded-lg overflow-hidden inset-auto w-11/12 lg:w-1/2 sm:max-w-168 min-h-1/4 bg-white flex z-50 relative shadow-modal">
+  <div aria-expanded="true" role="dialog" aria-modal="true" class="modal-body rounded-lg inset-auto w-11/12 lg:w-1/2 sm:max-w-168 min-h-1/4 bg-white flex z-50 relative shadow-modal overflow-auto max-h-full">
     <div class="flex-1 flex flex-col justify-between">
       <div>
         <div class="p-6 text-2xl tracking-normal font-semibold text-black">

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.record.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
@@ -237,7 +244,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
       data: {
         confirm: "Are you sure you want to detach this #{title}."
       } do
-      control.label || t("avo.detach_item", item: title).capitalize
+      control.label || t("avo.detach_item", item: title).humanize
     end
   end
 
@@ -311,4 +318,21 @@ class Avo::ResourceComponent < Avo::BaseComponent
   def is_a_related_resource?
     @reflection.present? && @resource.record.present?
   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? && Rails.env.development?
+      puts "WARNING! Avo uses the 'inverse_of' option to determine the inverse association and figure out if the association permit or not detaching."
+      # Ex: Please configure the 'inverse_of' option for the ':users' association on the 'Project' model.
+      puts "Please configure the 'inverse_of' option for the '#{current_reflection.macro} :#{current_reflection.name}' association on the '#{current_reflection.active_record.name}' model."
+      puts "Otherwise the detach button will be visible by default.\n\n"
+    end
+
+    inverse_of
+  end
 end

data/app/components/avo/sidebar_component.rb

@@ -7,7 +7,7 @@ class Avo::SidebarComponent < ViewComponent::Base
   end
 
   def dashboards
-    return [] unless defined?(Avo::Dashboards)
+    return [] unless Avo.plugin_manager.installed?("avo-dashboards")
 
     Avo::Dashboards.dashboard_manager.dashboards_for_navigation
   end

data/app/controllers/avo/actions_controller.rb

@@ -53,7 +53,7 @@ module Avo
         record: @record,
         resource: @resource,
         user: _current_user,
-        view: @view,
+        view: :new, # force the action view to in order to render new-related fields (hidden field)
         arguments: decrypted_arguments || {}
       )
     end
@@ -80,7 +80,8 @@ module Avo
           flash_messages messages
 
           if response[:type] == :redirect
-            redirect_to Avo::ExecutionContext.new(target: response[:path]).handle
+            redirect_to Avo::ExecutionContext.new(target: response[:path]).handle,
+              **{allow_other_host: response[:allow_other_host], status: response[:status]}.compact
           elsif response[:type] == :reload
             redirect_back fallback_location: resources_path(resource: @resource)
           end

data/app/controllers/avo/associations_controller.rb

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

data/lib/avo/base_action.rb

@@ -14,6 +14,7 @@ module Avo
     class_attribute :standalone, default: false
     class_attribute :visible
     class_attribute :may_download_file, default: false
+    class_attribute :turbo
 
     attr_accessor :response
     attr_accessor :record
@@ -38,9 +39,9 @@ module Avo
       def form_data_attributes
         # We can't respond with a file download from Turbo se we disable it on the form
         if may_download_file
-          {turbo: false, remote: false, action_target: :form}
+          {turbo: turbo || false, remote: false, action_target: :form}
         else
-          {turbo_frame: :_top, action_target: :form}
+          {turbo: turbo, turbo_frame: :_top, action_target: :form}.compact
         end
       end
 
@@ -198,8 +199,10 @@ module Avo
       self
     end
 
-    def redirect_to(path = nil, &block)
+    def redirect_to(path = nil, allow_other_host: nil, status: nil, &block)
       response[:type] = :redirect
+      response[:allow_other_host] = allow_other_host
+      response[:status] = status
       response[:path] = if block.present?
         block
       else

data/lib/avo/base_resource.rb

@@ -176,7 +176,7 @@ module Avo
         default = class_name.underscore.humanize
 
         if translation_key
-          t(translation_key, count: 1, default: default).capitalize
+          t(translation_key, count: 1, default: default).humanize
         else
           default
         end
@@ -187,7 +187,7 @@ module Avo
         default = name.pluralize
 
         if translation_key
-          t(translation_key, count: 2, default: default).capitalize
+          t(translation_key, count: 2, default: default).humanize
         else
           default
         end
@@ -320,7 +320,7 @@ module Avo
       when :edit
         record_title
       when :new
-        t("avo.create_new_item", item: name.downcase).upcase_first
+        t("avo.create_new_item", item: name.humanize(capitalize: false)).upcase_first
       end
     end
 

data/lib/avo/fields/base_field.rb

@@ -93,11 +93,11 @@ module Avo
       end
 
       def translated_name(default:)
-        t(translation_key, count: 1, default: default).capitalize
+        t(translation_key, count: 1, default: default).humanize
       end
 
       def translated_plural_name(default:)
-        t(translation_key, count: 2, default: default).capitalize
+        t(translation_key, count: 2, default: default).humanize
       end
 
       # Getting the name of the resource (user/users, post/posts)

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

@@ -6,7 +6,7 @@ module Avo
           super(**args)
 
           if args[:item].present?
-            @label = I18n.t("avo.create_new_item", item: args[:item]) if label.nil?
+            @label = I18n.t("avo.create_new_item", item: args[:item].humanize(capitalize: false)) if label.nil?
           end
         end
       end

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

@@ -7,7 +7,7 @@ module Avo
 
           @label = args[:label] || I18n.t("avo.delete").capitalize
           if args[:item].present?
-            @title = I18n.t("avo.delete_item", item: args[:item]).capitalize if title.nil?
+            @title = I18n.t("avo.delete_item", item: args[:item]).humanize if title.nil?
             @confirmation_message = I18n.t("avo.are_you_sure") if confirmation_message.nil?
           end
         end

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

@@ -6,7 +6,7 @@ module Avo
           super(**args)
 
           if args[:item].present?
-            @title = I18n.t("avo.detach_item", item: args[:item]).capitalize if title.nil?
+            @title = I18n.t("avo.detach_item", item: args[:item]).humanize if title.nil?
             @confirmation_message = I18n.t("avo.are_you_sure_detach_item", item: args[:item]) if confirmation_message.nil?
           end
         end

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

@@ -7,7 +7,7 @@ module Avo
 
           @label = args[:label] || I18n.t("avo.edit").capitalize
           if args[:item].present?
-            @title = I18n.t("avo.edit_item", item: args[:item]).capitalize if title.nil?
+            @title = I18n.t("avo.edit_item", item: args[:item]).humanize if title.nil?
           end
         end
       end

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

@@ -6,7 +6,7 @@ module Avo
           super(**args)
 
           if args[:item].present?
-            @title = I18n.t("avo.view_item", item: args[:item]).capitalize if title.nil?
+            @title = I18n.t("avo.view_item", item: args[:item]).humanize if title.nil?
           end
         end
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.0.pre17" unless const_defined?(:VERSION)
+  VERSION = "3.0.0.pre18" unless const_defined?(:VERSION)
 end