avo 1.18.2 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9e6624587295b46f8f052da4cb2b6ffb8faff958d1de9ab0fe2eb98a58c05c
-  data.tar.gz: 1010b48e463a388d0b20e3348de1c49f8468d63c2a14d78fe9ca4a9ad5c87e3e
+  metadata.gz: fe6f8fd6152562419ea4552e39ad441375f04932f9c3e15d4a46562d815a85a3
+  data.tar.gz: 87a5b8936878970adb4be91743166f4fb33105d13110e517848dc865eb606157
 SHA512:
-  metadata.gz: d18de447e0138f28d1ceb806bf16968b88dc81c0f1b097fee892bda8b19259a8df939c3fe3060e963a0f1f04e2696f3706b1f68a42b92c2e1f53a48e09788518
-  data.tar.gz: 91d9ec101ce25c6dba5300a054476ef8fef432cfe18d6140b0f6ff92a73be95fca213a549af6c38bfd7e3f392822ad6feaeea2fff77f208395137f063e3b7594
+  metadata.gz: 65b14a78a7f769504202072693f7b5f648a798989d7e74e7aad0d4909d610cd2ffc4092a39fbe69d8cabdc7ffb69b0d350fac3cb93951f6dc27db9ffd5678ca0
+  data.tar.gz: ca87e17c0fcb5aeee675aee252fa1d872aedab05109981410198376c77b8d79e8159d566bb2db9f0fec1952c1c098113a45fa1e8cbb5fc321c4864f0e80ba57a

data/Gemfile

@@ -15,7 +15,7 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem "webpacker", "6.0.0.rc.6"
+gem "webpacker", "6.0.0.rc.2"
 
 gem "countries"
 
@@ -91,7 +91,7 @@ group :test do
   gem "rspec-rails", "~> 4.0.0"
   gem "rails-controller-testing"
   # Adds support for Capybara system testing and selenium driver
-  gem "capybara", ">= 2.15"
+  gem "capybara", "3.36"
   gem "selenium-webdriver"
   # Easy installation and use of web drivers to run system tests with browsers
   gem "webdrivers"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.18.2)
+    avo (1.19.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -224,7 +224,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.0)
+    nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
@@ -394,7 +394,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (6.0.0.rc.6)
+    webpacker (6.0.0.rc.2)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -420,7 +420,7 @@ DEPENDENCIES
   breadcrumbs_on_rails
   bump
   byebug
-  capybara (>= 2.15)
+  capybara (= 3.36)
   countries
   database_cleaner
   devise
@@ -461,8 +461,8 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  webpacker (= 6.0.0.rc.6)
+  webpacker (= 6.0.0.rc.2)
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.32
+   2.3.5

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

@@ -1,3 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <%= link_to @field.label, helpers.resource_path(@field.value) %>
+  <%= link_to @field.label, helpers.resource_path(model: @field.value, resource: @field.target_resource) %>
 <% end %>

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

@@ -1,3 +1,3 @@
 <%= show_field_wrapper field: @field, index: @index do %>
-  <%= link_to @field.label, helpers.resource_path(@field.value, via_resource_class: @resource.model_class, via_resource_id: @resource.model.id) %>
+  <%= link_to @field.label, helpers.resource_path(model: @field.value, resource: @field.target_resource, via_resource_class: @resource.model_class, via_resource_id: @resource.model.id) %>
 <% end %>

data/app/components/avo/fields/common/multiple_file_viewer_component.html.erb

@@ -23,7 +23,7 @@
       </div>
       <div>
         <% if @resource.authorization.authorize_action(:delete_attachments?, raise_exception: false) %>
-          <%= a_link "#{Avo::App.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id}/active_storage_attachments/#{@id}/#{@file.id}", color: :red, variant: :outlined, size: :xs, class: 'text-center', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
+          <%= a_link "#{@resource.record_path}/active_storage_attachments/#{@id}/#{@file.id}", color: :red, variant: :outlined, size: :xs, class: 'text-center', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
             <%= helpers.svg 'trash' %> <span class="hidden lg:block lg:flex-1"><%= t 'avo.delete_file', item: @file.filename %></span>
           <% end %>
         <% end %>

data/app/components/avo/fields/common/single_file_viewer_component.html.erb

@@ -23,8 +23,7 @@
       </div>
       <div>
         <% if @resource.authorization.authorize_action(:delete_attachments?, raise_exception: false) %>
-          <%= a_link "#{Avo::App.root_path}/resources/#{@resource.model.model_name.route_key}/#{@resource.model.id
-          }/active_storage_attachments/#{@id}/#{@file.blob_id}", color: :red, variant: :outlined, size: :md, class: '', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
+          <%= a_link "#{@resource.record_path}/active_storage_attachments/#{@id}/#{@file.blob_id}", color: :red, variant: :outlined, size: :md, class: '', 'data-turbo-frame': 'destroy_attachment_form', data: { confirm: t('avo.are_you_sure')} do %>
             <%= helpers.svg 'trash' %> <%= t 'avo.delete_file', item: @file.filename %>
           <% end %>
         <% end %>

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

@@ -1,3 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <%= link_to @field.label, helpers.resource_path(@field.value) %>
+  <%= link_to @field.label, helpers.resource_path(model: @field.value, resource: @field.target_resource) %>
 <% end %>

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

@@ -6,7 +6,7 @@
   <%= render Avo::PanelComponent.new(title: @field.id.capitalize) do |c| %>
     <% c.tools do %>
       <% if !@field.readonly && can_attach? %>
-        <%= a_link helpers.resource_attach_path(@resource.model.model_name.route_key, @resource.model.id, @field.id), color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
+        <%= a_link attach_path, color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
           <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: @field.id).capitalize %>
         <% end %>
       <% end %>

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -8,8 +8,9 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
     if @field.present?
       reflection_resource = @field.target_resource
       if reflection_resource.present? && @resource.present?
-        method_name = ('attach_' + reflection_resource.model_class.model_name.singular_route_key.underscore + '?').to_sym
+        method_name = ("attach_#{reflection_resource.model_key}?").to_sym
         defined_policy_methods = @resource.authorization.defined_methods(@resource.model_class, raise_exception: false)
+
         if defined_policy_methods.present? && defined_policy_methods.include?(method_name)
           attach_policy = @resource.authorization.authorize_action(method_name, raise_exception: false)
         end
@@ -17,4 +18,8 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
     end
     attach_policy
   end
+
+  def attach_path
+    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.id, @field.id)
+  end
 end

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

@@ -12,9 +12,9 @@ class Avo::Fields::IndexComponent < ViewComponent::Base
 
   def resource_path
     if @parent_model.present?
-      helpers.resource_path(@resource.model, via_resource_class: @parent_model.class, via_resource_id: @parent_model.id)
+      helpers.resource_path(model: @resource.model, resource: @resource, via_resource_class: @parent_model.class, via_resource_id: @parent_model.id)
     else
-      helpers.resource_path(@resource.model)
+      helpers.resource_path(model: @resource.model, resource: @resource)
     end
   end
 end

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

@@ -2,7 +2,7 @@
   <div
     data-controller="trix-field"
     data-trix-field-target="controller"
-    data-resource-name="<%= @resource.model_class.model_name.route_key %>"
+    data-resource-name="<%= @resource.model_key %>"
     data-resource-id="<%= @resource.model.id %>"
     data-attachments-disabled="<%= @field.attachments_disabled %>"
     data-attachment-key="<%= @field.attachment_key %>"

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

@@ -7,17 +7,17 @@
     <% if cover.blank? %>
       <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
     <% elsif cover.respond_to?(:to_image) && cover.to_image.present? %>
-      <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(model: @resource.model, resource: @resource), class: 'absolute h-full w-full object-cover', title: title.value %>
     <% elsif cover.type == 'file' %>
       <% if cover.value.attached? && cover.value.representable? %>
-        <%= link_to_if cover.link_to_resource, image_tag(helpers.main_app.url_for(cover.value.variant(resize_to_limit: [480, 480])), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+        <%= link_to_if cover.link_to_resource, image_tag(helpers.main_app.url_for(cover.value.variant(resize_to_limit: [480, 480])), class: 'absolute h-full w-full object-cover'), helpers.resource_path(model: @resource.model, resource: @resource), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <div class="absolute bg-gray-100 w-full h-full">
           <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
         </div>
       <% end %>
     <% elsif cover.value.present? %>
-      <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(model: @resource.model, resource: @resource), class: 'absolute h-full w-full object-cover', title: title.value %>
     <% else %>
       <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
     <% end %>
@@ -25,7 +25,7 @@
   <div class="grid grid-cols-1 place-content-between p-4 h-full">
     <div class="mb-4">
       <div class="grid font-semibold leading-tight text-lg mb-2">
-        <%= link_to_if title.link_to_resource, title.value, helpers.resource_path(@resource.model) if title.present? %>
+        <%= link_to_if title.link_to_resource, title.value, helpers.resource_path(model: @resource.model, resource: @resource) if title.present? %>
       </div>
       <div class="text-sm break-words">
         <%= body.value if body.present? %>

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

@@ -42,7 +42,7 @@
   <% end %>
 
   <% if can_delete? %>
-    <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: {
+    <%= form_with url: helpers.resource_path(model: @resource.model, resource: @resource), method: :delete, html: {
         'data-turbo-frame': params[:turbo_frame]
       } do |form| %>
       <%= form.button helpers.svg('trash', class: 'text-gray-400 h-6 hover:text-gray-600'),

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

@@ -23,19 +23,29 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def show_path
+    args = {}
+
     if @parent_model.present?
-      helpers.resource_path(@resource.model, via_resource_class: @parent_model.class.base_class, via_resource_id: @parent_model.id)
-    else
-      helpers.resource_path(@resource.model)
+      args = {
+        via_resource_class: parent_resource.model_class,
+        via_resource_id: @parent_model.id
+      }
     end
+
+    helpers.resource_path(model: @resource.model, resource: @resource, **args)
   end
 
   def edit_path
+    args = {}
+
     if @parent_model.present?
-      helpers.edit_resource_path(@resource.model, via_resource_class: @parent_model.class.base_class, via_resource_id: @parent_model.id)
-    else
-      helpers.edit_resource_path(@resource.model)
+      args = {
+        via_resource_class: parent_resource.model_class,
+        via_resource_id: @parent_model.id
+      }
     end
+
+    helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
   end
 
   def singular_resource_name
@@ -45,4 +55,10 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
       @resource.singular_name.present? ? @resource.singular_name : @resource.model_class.model_name.name.downcase
     end
   end
+
+  def parent_resource
+    return nil if @parent_model.blank?
+
+    ::Avo::App.get_resource_by_model_name @parent_model.class
+  end
 end

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

@@ -1,6 +1,6 @@
 <div class="w-full">
   <% if @resources.present?%>
-    <table class="w-full px-4 overflow-hidden" data-resource-name='<%= @resource.model_class.model_name.route_key %>' data-controller='item-select-all'>
+    <table class="w-full px-4 overflow-hidden" data-resource-name='<%= @resource.model_key %>' data-controller='item-select-all'>
       <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection)} %>
       <tbody>
         <% @resources.each_with_index do |resource, index| %>

data/app/components/avo/panel_component.rb

@@ -6,19 +6,18 @@ class Avo::PanelComponent < ViewComponent::Base
   renders_one :bare_content
   renders_one :footer
 
-  def initialize(title: nil, body_classes: nil, data: {}, display_breadcrumbs: false)
+  def initialize(title: nil, body_classes: nil, data: {}, display_breadcrumbs: false, index: nil)
     @title = title
     @body_classes = body_classes
     @data = data
     @display_breadcrumbs = display_breadcrumbs
+    @index = index
   end
 
   private
 
   def data_attributes
-    return if @data.blank?
-
-    @data.map do |key, value|
+    @data.merge({'panel-index': @index}).map do |key, value|
       " data-#{key}=\"#{value}\""
     end.join
   end

data/app/components/avo/resource_component.rb

@@ -12,7 +12,7 @@ class Avo::ResourceComponent < ViewComponent::Base
     if @reflection.present?
       reflection_resource = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name)
       if reflection_resource.present?
-        method_name = ("#{policy_method}_#{@reflection.name.to_s.underscore}?").to_sym
+        method_name = "#{policy_method}_#{@reflection.name.to_s.underscore}?".to_sym
         defined_policy_methods = reflection_resource.authorization.defined_methods(reflection_resource.model_class, raise_exception: false)
         if defined_policy_methods.present? && defined_policy_methods.include?(method_name)
           association_policy = reflection_resource.authorization.authorize_action(method_name, raise_exception: false)
@@ -28,4 +28,8 @@ class Avo::ResourceComponent < ViewComponent::Base
   def simple_relation?
     @reflection.is_a? ::ActiveRecord::Reflection::HasManyReflection
   end
+
+  def relation_resource
+    ::Avo::App.get_resource_by_model_name params[:via_resource_class].safe_constantize
+  end
 end

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

@@ -1,6 +1,6 @@
 <div data-model-id="<%= @resource.model.id %>">
   <% @resource.panels.each do |resource_panel| %>
-    <%= form_with model: @resource.model, scope: @resource.form_scope, url: helpers.resource_path(@resource.model), method: :put, multipart: true do |form| %>
+    <%= form_with model: @resource.model, scope: @resource.form_scope, url: helpers.resource_path(model: @resource.model, resource: @resource), method: :put, multipart: true do |form| %>
       <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>
 
       <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
@@ -11,7 +11,7 @@
             <% end %>
 
             <% if @resource.authorization.authorize_action :update, raise_exception: false %>
-              <%= a_button color: 'green', variant: 'outlined', type: :submit do %>
+              <%= a_button color: 'green', variant: 'outlined', spinner: true, type: :submit do %>
                 <%= helpers.svg 'save' %> <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>

data/app/components/avo/views/resource_edit_component.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Avo::Views::ResourceEditComponent < ViewComponent::Base
+class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
@@ -10,9 +10,9 @@ class Avo::Views::ResourceEditComponent < ViewComponent::Base
 
   def back_path
     if via_resource?
-      helpers.resource_path(params[:via_resource_class].safe_constantize, resource_id: params[:via_resource_id])
+      helpers.resource_path(model: params[:via_resource_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
     else
-      helpers.resource_path(@resource.model)
+      helpers.resource_path(model: @resource.model, resource: @resource)
     end
   end
 

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

@@ -9,12 +9,6 @@
         <% end %>
       <% end %>
 
-      <% if can_detach? %>
-        <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@resource.singular_name}." } do %>
-          <%= svg 'trash' %> <%= t('avo.detach_item', item: singular_resource_name).capitalize %>
-        <% end %>
-      <% end %>
-
       <% if can_attach? %>
         <%= a_link attach_path, color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
           <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
@@ -24,11 +18,11 @@
 
     <% c.body do %>
       <div class="flex justify-between pt-2 pb-2 min-h-16"
-        data-selected-resources-name="<%= @resource.model_class.model_name.route_key %>"
+        data-selected-resources-name="<%= @resource.model_key %>"
         data-selected-resources="[]"
       >
         <div class="flex items-center px-6 w-64">
-          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} if @resource.search_query.present? %>
+          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_class.model_name.plural} if @resource.search_query.present? %>
         </div>
         <div class="flex justify-end items-center px-6 space-x-3">
           <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>

data/app/components/avo/views/resource_index_component.rb

@@ -55,10 +55,6 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for("attach")
   end
 
-  def can_detach?
-    @reflection.present? && @reflection.is_a?(::ActiveRecord::Reflection::HasOneReflection) && @models.present? && !has_reflection_and_is_read_only && authorize_association_for("detach")
-  end
-
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
       fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
@@ -75,35 +71,31 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def create_path
+    args = {}
+
     if @reflection.present?
-      path_args = {
+      args = {
         via_relation_class: @parent_model.model_name,
         via_resource_id: @parent_model.id
       }
 
       if @reflection.inverse_of.present?
-        path_args[:via_relation] = @reflection.inverse_of.name
+        args[:via_relation] = @reflection.inverse_of.name
       end
-
-      helpers.new_resource_path(@resource.model_class, **path_args)
-    else
-      helpers.new_resource_path(@resource.model_class)
     end
+
+    helpers.new_resource_path(model: @resource.model_class, resource: @resource, **args)
   end
 
   def attach_path
     "#{Avo::App.root_path}#{request.env["PATH_INFO"]}/new"
   end
 
-  def detach_path
-    helpers.resource_detach_path(via_resource_name, via_resource_id, via_relation_param, @models.first.id)
-  end
-
   def singular_resource_name
     if @reflection.present?
       ::Avo::App.get_resource_by_model_name(@reflection.class_name).name
     else
-      @resource.singular_name.present? ? @resource.singular_name : @resource.model_class.model_name.name.downcase
+      @resource.singular_name || @resource.model_class.model_name.name.downcase
     end
   end
 

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

@@ -1,6 +1,6 @@
 <div>
   <% @resource.panels.each do |resource_panel| %>
-    <%= form_with model: @resource.model, url: helpers.resources_path(@resource.model, via_relation_class: params[:via_relation_class], via_resource_id: params[:via_resource_id]), local: true, multipart: true do |form| %>
+    <%= form_with model: @resource.model, url: helpers.resources_path(resource: @resource, via_relation_class: params[:via_relation_class], via_resource_id: params[:via_resource_id]), local: true, multipart: true do |form| %>
       <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
@@ -8,7 +8,7 @@
               <%= svg 'arrow-left' %> <%= t('avo.cancel').capitalize %>
             <% end %>
 
-            <%= a_button color: 'green', type: :submit do %>
+            <%= a_button color: 'green', spinner: true, type: :submit do %>
               <%= svg 'save' %> <%= t('avo.save').capitalize %>
             <% end if @resource.authorization.authorize_action :create, raise_exception: false %>
           </div>

data/app/components/avo/views/resource_new_component.rb

@@ -14,9 +14,9 @@ class Avo::Views::ResourceNewComponent < ViewComponent::Base
 
   def back_path
     if via_resource?
-      helpers.resource_path(params[:via_relation_class].safe_constantize, resource_id: params[:via_resource_id])
+      helpers.resource_path(model: params[:via_relation_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
     else
-      helpers.resources_path(@resource.model)
+      helpers.resources_path(resource: @resource)
     end
   end
 
@@ -25,4 +25,8 @@ class Avo::Views::ResourceNewComponent < ViewComponent::Base
   def via_resource?
     params[:via_relation_class].present? && params[:via_resource_id].present?
   end
+
+  def relation_resource
+    ::Avo::App.get_resource_by_model_name params[:via_relation_class].safe_constantize
+  end
 end

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

@@ -1,9 +1,9 @@
 <div data-model-id="<%= @resource.model.id %>"
-  data-selected-resources-name="<%= @resource.model.model_name.route_key %>"
+  data-selected-resources-name="<%= @resource.model_key %>"
   data-selected-resources='["<%= @resource.model.id %>"]'
 >
-  <% @resource.panels.each do |resource_panel| %>
-    <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: @reflection.blank?) do |c| %>
+  <% @resource.panels.each_with_index do |resource_panel, index| %>
+    <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: @reflection.blank?, index: index) do |c| %>
       <% c.tools do %>
         <% if resource_panel[:name] == @resource.default_panel_name %>
           <%= render 'actions' %>
@@ -25,8 +25,9 @@
             <% end %>
 
             <% if @resource.authorization.authorize_action(:destroy, raise_exception: false) %>
-              <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: { 'data-turbo-frame': params[:turbo_frame] } do |form| %>
+              <%= form_with url: helpers.resource_path(model: @resource.model, resource: @resource), method: :delete, html: { 'data-turbo-frame': params[:turbo_frame] } do |form| %>
                 <%= a_button title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,
+                  spinner: true,
                   color: 'red',
                   variant: 'outlined',
                   type: :submit,

data/app/components/avo/views/resource_show_component.rb

@@ -15,18 +15,23 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
 
   def back_path
     if via_resource?
-      helpers.resource_path(params[:via_resource_class].safe_constantize, resource_id: params[:via_resource_id])
+      helpers.resource_path(model: params[:via_resource_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
     else
-      helpers.resources_path(@resource.model)
+      helpers.resources_path(resource: @resource)
     end
   end
 
   def edit_path
+    args = {}
+
     if via_resource?
-      helpers.edit_resource_path(@resource.model, via_resource_class: params[:via_resource_class], via_resource_id: params[:via_resource_id])
-    else
-      helpers.edit_resource_path(@resource.model)
+      args = {
+        via_resource_class: params[:via_resource_class],
+        via_resource_id: params[:via_resource_id]
+      }
     end
+
+    helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
   end
 
   def detach_path
@@ -34,7 +39,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   end
 
   def destroy_path
-    helpers.resource_path(@resource.model)
+    helpers.resource_path(model: @resource.model, resource: @resource)
   end
 
   def can_detach?

data/app/controllers/avo/actions_controller.rb

@@ -67,7 +67,7 @@ module Avo
 
             redirect_to path, "#{response[:message_type]}": response[:message]
           elsif response[:type] == :reload
-            redirect_back fallback_location: resources_path(@resource.model_class), "#{response[:message_type]}": response[:message]
+            redirect_back fallback_location: resources_path(resource: @resource), "#{response[:message_type]}": response[:message]
           end
         end
       end

data/app/controllers/avo/application_controller.rb

@@ -3,6 +3,7 @@ module Avo
     include Pundit
     include Pagy::Backend
     include Avo::ApplicationHelper
+    include Avo::UrlHelpers
 
     protect_from_forgery with: :exception
     before_action :init_app
@@ -19,7 +20,7 @@ module Avo
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user
+      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user, view_context: view_context
 
       @license = Avo::App.license
     end
@@ -70,66 +71,6 @@ module Avo
       instance_eval(&Avo.configuration.context)
     end
 
-    def resources_path(model, keep_query_params: false, **args)
-      return if model.nil?
-
-      model_class = get_model_class model
-
-      existing_params = {}
-
-      begin
-        if keep_query_params
-          existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
-        end
-      rescue; end
-      avo.send :"resources_#{model_class.base_class.model_name.route_key}_path", **existing_params, **args
-    end
-
-    def related_resources_path(parent_model, model, keep_query_params: false, **args)
-      return if model.nil?
-
-      existing_params = {}
-
-      begin
-        if keep_query_params
-          existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
-        end
-      rescue; end
-      Addressable::Template.new("#{Avo::App.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
-        .expand({query: {**existing_params, **args}})
-        .to_str
-    end
-
-    def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
-      return avo.send :"resources_#{singular_name(model)}_path", resource_id, **args if resource_id.present?
-
-      avo.send :"resources_#{singular_name(model)}_path", model, **args
-    end
-
-    def resource_attach_path(model_name, model_id, related_name, related_id = nil)
-      path = "#{Avo::App.root_path}/resources/#{model_name}/#{model_id}/#{related_name}/new"
-
-      path += "/#{related_id}" if related_id.present?
-
-      path
-    end
-
-    def resource_detach_path(model_name, model_id, related_name, related_id = nil)
-      path = "#{Avo::App.root_path}/resources/#{model_name}/#{model_id}/#{related_name}"
-
-      path += "/#{related_id}" if related_id.present?
-
-      path
-    end
-
-    def new_resource_path(model, **args)
-      avo.send :"new_resources_#{singular_name(model)}_path", **args
-    end
-
-    def edit_resource_path(model, **args)
-      avo.send :"edit_resources_#{singular_name(model)}_path", model.id, **args
-    end
-
     private
 
     def set_resource_name