avo 2.15.3 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68cfd9efb2f52f774b347c404afe6b68e8e0e21102500e234184a11a4b8dd104
-  data.tar.gz: b8f9fc9d7a24fc30a453f0643aeae48c2e4bb9ecce27b59679e246bd55054fa3
+  metadata.gz: 8ca4190d675e166dedf5f47c9c68f3b7fa57e29c9e7510262a4033f1c0cbb00d
+  data.tar.gz: 6f4f3c3f1a39fbb7b9d3566ff679cd3992b684576b1e4c1451b7d4fdd39c173f
 SHA512:
-  metadata.gz: c80aedbf84f25b6b53e99d51c6ba3e603eaa619e9963ae988b4f76469f3f14c92e9e5f8045234bb7746cbed3008b9656d598effc0d49c742665acbbd4d35390a
-  data.tar.gz: c116b5296b79976867bd3f3342d334d355e7a5acb012b5bbb7e2965b65d98794f08b6f747d07e1598b144ff78c5c1fcfcf0e978ab681166ea67ca8a86abf9b4c
+  metadata.gz: c2dfc8a393554111f16a4c95ed94ef1180e9b448327d182071ebef301773e37436db614411121744107bae9252e40a5432d828ebb2661abef2148883e0675c08
+  data.tar.gz: 3914b51410ba770dd7f8a396bddfb6bb1be58d694aebb159f23b3de1e3c841186fa85d62bf0d982ef475a5a07c80bd9f24a4cf41d0b22a874e4df073dc11da25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.15.3)
+    avo (2.16.0)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -1,3 +1,4 @@
 <%= index_field_wrapper field: @field, resource: @resource do %>
-  <%= link_to @field.label, helpers.resource_path(model: @field.value, resource: @field.target_resource) %>
+  <%= link_to @field.label, helpers.resource_view_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, resource: @resource, index: @index do %>
-  <%= 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) %>
+  <%= link_to @field.label, resource_view_path %>
 <% end %>

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

@@ -1,4 +1,12 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::ShowComponent < Avo::Fields::ShowComponent
+  def resource_view_path
+    helpers.resource_view_path(
+      model: @field.value,
+      resource: @field.target_resource,
+      via_resource_class: @resource.model_class,
+      via_resource_id: @resource.model.id
+    )
+  end
 end

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

@@ -4,7 +4,7 @@
                    image_tag(@field.value,
                              height: @field.height,
                              style: "border-radius: #{@field.radius}px; max-height: #{@field.height}#{@field.height.to_s&.ends_with?('px') ? '' : 'px'};"),
-                   resource_path
+                   resource_view_path
     %>
   <% end %>
 <% end %>

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

@@ -1,9 +1,9 @@
 <%= index_field_wrapper field: @field, resource: @resource, flush: flush? do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
-      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_path, class: 'block' %>
+      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>
     <% elsif @field.value.attached? && @field.is_audio %>
-      <%= link_to_if @field.link_to_resource, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full h-10'), resource_path, class: 'block h-8' %>
+      <%= link_to_if @field.link_to_resource, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full h-10'), resource_view_path, class: 'block h-8' %>
     <% else %>
       <%= @field.value.filename %>
     <% end %>

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

@@ -5,7 +5,7 @@
     size: @field.size,
     rounded: @field.rounded,
     link_to_resource: @field.link_to_resource,
-    link: resource_path,
+    link: resource_view_path,
     title: t('avo.view_item', item: @resource.name).humanize
   )
   %>

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

@@ -6,10 +6,23 @@
   <%= render Avo::PanelComponent.new(name: @field.name) do |c| %>
     <% c.tools do %>
       <% if !@field.is_readonly? && can_attach? %>
-        <%= a_link attach_path, icon: 'heroicons/outline/link', color: :primary, 'data-turbo-frame': 'attach_modal' do %>
+        <%= a_link attach_path,
+          icon: 'heroicons/outline/link',
+          color: :primary,
+          'data-turbo-frame': 'attach_modal' do %>
           <%= t('avo.attach_item', item: @field.name.downcase) %>
         <% end %>
       <% end %>
+      <% if !@field.is_readonly? && can_see_the_create_button? %>
+        <%= a_link create_path,
+          icon: 'heroicons/outline/plus',
+          'data-target': 'create',
+          'data-turbo-frame': '_top',
+          style: :primary,
+          color: :primary do %>
+          <%= t('avo.create_new_item', item: @field.name.downcase ) %>
+        <% end %>
+      <% end %>
     <% end %>
 
     <% c.body do %>

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

@@ -23,4 +23,25 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   def attach_path
     helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.id, @field.id)
   end
+
+  def can_see_the_create_button?
+    create = "create_#{@field.id.to_s}?"
+
+    authorization_service = @resource.authorization
+
+    # By default return true if the create method is not defined for this field
+    return true unless authorization_service.has_method?(create, raise_exception: false)
+
+    authorization_service.authorize_action(create, raise_exception: false)
+  end
+
+  def create_path
+    args = {
+      via_relation: @resource.singular_model_key,
+      via_relation_class: @resource.name,
+      via_resource_id: @resource.model.id
+    }
+
+    helpers.new_resource_path(resource: @field.target_resource, **args)
+  end
 end

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

@@ -1,3 +1,3 @@
 <%= index_field_wrapper field: @field, resource: @resource, class: 'whitespace-no-wrap w-[1%]' do %>
-  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, resource_path, title: t('avo.view_item', item: @resource.name).humanize %>
+  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, resource_view_path, title: t('avo.view_item', item: @resource.name).humanize %>
 <% end %>

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

@@ -13,11 +13,16 @@ class Avo::Fields::IndexComponent < ViewComponent::Base
     @view = :index
   end
 
-  def resource_path
+  def resource_view_path
+    args = {}
+
     if @parent_model.present?
-      helpers.resource_path(model: @resource.model, resource: @resource, via_resource_class: @parent_model.class, via_resource_id: @parent_model.id)
-    else
-      helpers.resource_path(model: @resource.model, resource: @resource)
+      args = {
+        via_resource_class: @parent_model.class,
+        via_resource_id: @parent_model.id
+      }
     end
+
+    helpers.resource_view_path(model: @resource.model, resource: @resource, **args)
   end
 end

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

@@ -4,6 +4,6 @@
   <% elsif @field.protocol.present? %>
     <%= link_to @field.value, "#{@field.protocol}:#{@field.value}" %>
   <% else %>
-    <%= link_to_if @field.link_to_resource, @field.value, resource_path %>
+    <%= link_to_if @field.link_to_resource, @field.value, resource_view_path %>
   <% end %>
 <% end %>

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

@@ -1,16 +1,16 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, full_width: true do %>
-  <div
-    data-controller="trix-field"
-    data-trix-field-target="controller"
-    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-hide-attachment-filename="<%= @field.hide_attachment_filename %>"
-    data-hide-attachment-filesize="<%= @field.hide_attachment_filesize %>"
-    data-hide-attachment-url="<%= @field.hide_attachment_url %>"
-    class="relative block overflow-x-auto max-w-full"
-  >
+  <%= content_tag :div, class: "relative block overflow-x-auto max-w-full",
+    data: {
+      controller: "trix-field",
+      trix_field_target: "controller",
+      resource_name: @resource.model_key,
+      resource_id: @resource.model.methods.include?(:id) ? @resource.model&.id : nil,
+      attachments_disabled: @field.attachments_disabled,
+      attachment_key: @field.attachment_key,
+      hide_attachment_filename: @field.hide_attachment_filename,
+      hide_attachment_filesize: @field.hide_attachment_filesize,
+      hide_attachment_url: @field.hide_attachment_url,
+    } do %>
     <%= content_tag 'trix-editor',
       class: 'trix-content',
       data: {
@@ -29,5 +29,5 @@
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
-  </div>
+  <% end %>
 <% end %>

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

@@ -7,23 +7,23 @@
       <%== item_selector_input floating: true, size: :lg %>
     <% end %>
     <% if cover.blank? %>
-      <%= link_to cover.link_to_resource do %>
+      <%= link_to resource_view_path do %>
         <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
       <% end %>
     <% 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(model: @resource.model, resource: @resource), 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'), resource_view_path, 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(model: @resource.model, resource: @resource), 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'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
-        <%= link_to @resource.record_path do %>
+        <%= link_to resource_view_path do %>
           <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 %>
       <% 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(model: @resource.model, resource: @resource), 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'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
     <% else %>
       <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
     <% end %>
@@ -31,7 +31,7 @@
   <div class="grid grid-cols-1 place-content-between p-4 h-full">
     <div class="mb-4 h-full flex flex-col space-between">
       <div class="grid font-semibold leading-tight text-lg mb-2">
-        <%= link_to_if title.link_to_resource, title.value, helpers.resource_path(model: @resource.model, resource: @resource) if title.present? %>
+        <%= link_to_if title.link_to_resource, title.value, resource_view_path if title.present? %>
       </div>
       <div class="text-sm break-words text-gray-500">
         <%= body.value if body.present? %>

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

@@ -3,6 +3,8 @@
 class Avo::Index::GridItemComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
+  attr_reader :parent_resource
+
   def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
     @resource = resource
     @reflection = reflection
@@ -24,4 +26,17 @@ class Avo::Index::GridItemComponent < ViewComponent::Base
   def body
     @grid_fields.body_field
   end
+
+  def resource_view_path
+    args = {}
+
+    if @parent_model.present?
+      args = {
+        via_resource_class: parent_resource.model_class,
+        via_resource_id: @parent_model.id
+      }
+    end
+
+    helpers.resource_view_path(model: @resource.model, resource: @resource, **args)
+  end
 end

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

@@ -23,6 +23,8 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_view?
+    return false if Avo.configuration.resource_default_view == :edit
+
     return authorize_association_for(:show) if @reflection.present?
 
     # Even if there's a @reflection object present, for show we're going to fallback to the original policy.

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceGridComponent < ViewComponent::Base
-  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: @parent_resource)
+  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
     @resources = resources
     @resource = resource
     @reflection = reflection

data/app/components/avo/resource_component.rb

@@ -46,7 +46,11 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def destroy_path
-    helpers.resource_path(model: @resource.model, resource: @resource)
+    if params[:via_resource_class].present?
+      helpers.resource_path(model: @resource.model, resource: @resource, referrer: back_path)
+    else
+      helpers.resource_path(model: @resource.model, resource: @resource)
+    end
   end
 
   def authorize_association_for(policy_method)

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

@@ -1,11 +1,11 @@
 <% if item.is_a? Avo::Menu::Link %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target, data: item.data %>
 <% end %>
 <% if item.is_a? Avo::Menu::Resource %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource) %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource), data: item.data %>
 <% end %>
 <% if item.is_a? Avo::Menu::Dashboard %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path, data: item.data %>
 <% end %>
 <% if item.is_a? Avo::Menu::Section %>
   <%= render Avo::Sidebar::SectionComponent.new item: item %>

data/app/components/avo/sidebar/link_component.html.erb

@@ -1,12 +1,12 @@
 <% if path.present? %>
-  <%= send link_method, path, class: classes, active: active, target: target do %>
+  <%= send link_method, path, class: classes, active: active, target: target, data: data do %>
     <%= label %>
     <% if target == :_blank %>
       <%= helpers.svg('heroicons/outline/external-link', class: 'self-center ml-auto h-3 mr-2') %>
     <% end %>
   <% end %>
 <% else %>
-  <%= content_tag :div, class: classes, active: active, target: target do %>
+  <%= content_tag :div, class: classes, active: active, target: target, data: data do %>
     <%= label %>
   <% end %>
 <% end %>

data/app/components/avo/sidebar/link_component.rb

@@ -5,12 +5,14 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   attr_reader :target
   attr_reader :label
   attr_reader :path
+  attr_reader :data
 
-  def initialize(label: nil, path: nil, active: :inclusive, target: nil)
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {})
     @label = label
     @path = path
     @active = active
     @target = target
+    @data = data
   end
 
   def is_external?

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

@@ -22,6 +22,23 @@
         icon: 'arrow-left' do %>
           <%= t('avo.cancel').capitalize %>
         <% end %>
+        <% if can_see_the_destroy_button? %>
+          <%= a_link destroy_path,
+            method: :delete,
+            local: true,
+            style: :text,
+            loading: true,
+            confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+            color: :red,
+            icon: 'trash',
+            form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+            data: {
+              control: :destroy,
+              'resource-id': @resource.model.id,
+            } do %>
+            <%= t('avo.delete').capitalize %>
+          <% end %>
+        <% end %>
         <% if can_see_the_actions_button? %>
           <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
         <% end %>
@@ -41,8 +58,8 @@
         <% c.body do %>
           <div class="divide-y">
             <% main_panel.items.each_with_index do |field, index| %>
-              <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)
-                .component_for_view(view)
+              <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view_for(field))
+                .component_for_view(view_for field)
                 .new(field: field, resource: @resource, index: index, form: form)
               %>
             <% end %>

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

@@ -16,16 +16,28 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def back_path
-    if via_resource?
-      model = params[:via_resource_class] || params[:via_relation_class]
-      helpers.resource_path(model: model.safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
-    elsif via_index?
-      helpers.resources_path(resource: @resource)
-    elsif is_edit? # via resource show page
-      helpers.resource_path(model: @resource.model, resource: @resource)
-    else
-      helpers.resources_path(resource: @resource)
+    return resource_view_path if via_resource?
+    return resources_path if via_index?
+
+    if is_edit? && Avo.configuration.resource_default_view == :show # via resource show or edit page
+      return helpers.resource_path(model: @resource.model, resource: @resource)
     end
+
+    resources_path
+  end
+
+  def resources_path
+    helpers.resources_path(resource: @resource)
+  end
+
+  def resource_view_path
+    helpers.resource_view_path(model: relation_resource.model, resource: relation_resource)
+  end
+
+  def can_see_the_destroy_button?
+    return super if is_edit? && Avo.configuration.resource_default_view == :edit
+
+    false
   end
 
   # The save button is dependent on the edit? policy method.
@@ -65,4 +77,9 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
       )
     end
   end
+
+  # Render :show view for read only trix fields
+  def view_for(field)
+    (field.is_a? Avo::Fields::TrixField) && field.is_readonly? ? :show : view
+  end
 end

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

@@ -45,14 +45,6 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
   end
 
-  def destroy_path
-    if params[:via_resource_class].present?
-      helpers.resource_path(model: @resource.model, resource: @resource, referrer: back_path)
-    else
-      helpers.resource_path(model: @resource.model, resource: @resource)
-    end
-  end
-
   private
 
   # In development and test environments we shoudl show the invalid field errors

data/app/controllers/avo/actions_controller.rb

@@ -4,9 +4,15 @@ module Avo
   class ActionsController < ApplicationController
     before_action :set_resource_name
     before_action :set_resource
+    before_action :set_model, only: :show, if: ->(request) do
+      # Try to se the model only if the user is on the record page.
+      # set_model will fail if it's tried to be used from the Index page.
+      request.params[:id].present?
+    end
     before_action :set_action, only: [:show, :handle]
 
     def show
+      @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
       @model = ActionModel.new @action.get_attributes_for_action
     end
 
@@ -44,11 +50,7 @@ module Avo
     def set_action
       action_class = params[:action_id].gsub("avo_actions_", "").camelize.safe_constantize
 
-      if params[:id].present?
-        model = @resource.class.find_scope.find params[:id]
-      end
-
-      @action = action_class.new(model: model, resource: resource, user: _current_user, view: :edit)
+      @action = action_class.new(model: @model, resource: @resource, user: _current_user, view: :edit)
     end
 
     def respond(response)

data/app/controllers/avo/application_controller.rb

@@ -26,7 +26,7 @@ module Avo
     rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path
     add_flash_types :info, :warning, :success, :error
 
     def init_app
@@ -126,7 +126,19 @@ module Avo
     end
 
     def set_model
-      @model = eager_load_files(@resource, @resource.class.find_scope).find params[:id]
+      @model = model_find_scope.find record_id
+    end
+
+    def record_id
+      params.permit(:id).dig(:id)
+    end
+
+    def model_find_scope
+      eager_load_files(@resource, model_scope)
+    end
+
+    def model_scope
+      @resource.class.find_scope
     end
 
     def set_related_model

data/app/controllers/avo/associations_controller.rb

@@ -65,7 +65,7 @@ module Avo
 
       respond_to do |format|
         if @model.save
-          format.html { redirect_back fallback_location: resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
+          format.html { redirect_back fallback_location: resource_view_response_path, notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
         else
           format.html { render :new }
         end
@@ -80,7 +80,7 @@ module Avo
       end
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_detached", attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resource_view_response_path, notice: t("avo.attachment_class_detached", attachment_class: @attachment_class) }
       end
     end
 

data/app/controllers/avo/base_controller.rb

@@ -106,7 +106,7 @@ module Avo
 
       @page_title = @resource.default_panel_name.to_s
 
-      if params[:via_relation_class].present? && params[:via_resource_id].present?
+      if is_associated_record?
         via_resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
@@ -412,13 +412,17 @@ module Avo
 
     def after_create_path
       # If this is an associated record return to the association show page
-      if params[:via_relation_class].present? && params[:via_resource_id].present?
+      if is_associated_record?
         parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
 
-        return resource_path(model: params[:via_relation_class], resource: parent_resource, resource_id: params[:via_resource_id])
+        return resource_view_path(
+          model: @model.send(params[:via_relation]),
+          resource: parent_resource,
+          resource_id: params[:via_resource_id]
+        )
       end
 
-      redirect_path_from_resource_option(:after_create_path) || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_create_path) || resource_view_response_path
     end
 
     def update_success_action
@@ -445,7 +449,12 @@ module Avo
     def after_update_path
       return params[:referrer] if params[:referrer].present?
 
-      redirect_path_from_resource_option(:after_update_path) || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_update_path) || resource_view_response_path
+    end
+
+    # Needs a different name, otwherwise, in some places, this can be called instead helpers.resource_view_path
+    def resource_view_response_path
+      helpers.resource_view_path(model: @model, resource: @resource)
     end
 
     def destroy_success_action
@@ -477,11 +486,15 @@ module Avo
 
       if @resource.class.send(action) == :index
         resources_path(resource: @resource)
-      elsif @resource.class.send(action) == :edit
+      elsif @resource.class.send(action) == :edit || Avo.configuration.resource_default_view == :edit
         edit_resource_path(resource: @resource, model: @resource.model)
       else
         resource_path(model: @model, resource: @resource)
       end
     end
+
+    def is_associated_record?
+      params[:via_relation_class].present? && params[:via_resource_id].present?
+    end
   end
 end

data/app/helpers/avo/url_helpers.rb

@@ -76,5 +76,13 @@ module Avo
 
       avo.resources_associations_index_path(parent_model.model_name.route_key, record.id, **existing_params, **args)
     end
+
+    def resource_view_path(**args)
+      if Avo.configuration.resource_default_view == :edit
+        edit_resource_path(**args)
+      else
+        resource_path(**args)
+      end
+    end
   end
 end

data/app/views/avo/actions/show.html.erb

@@ -25,7 +25,11 @@
       <% if @action.get_fields.present? %>
         <div class="mt-4">
           <% @action.get_fields.each_with_index do |field, index| %>
-            <%= render field.component_for_view(:edit).new field: field, resource: @resource, index: index, form: form, displayed_in_modal: true %>
+            <%= render field
+              .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: @view)
+              .component_for_view(:edit)
+              .new(field: field, resource: @resource, index: index, form: form, displayed_in_modal: true)
+            %>
           <% end %>
         </div>
       <% end %>

data/lib/avo/base_action.rb

@@ -73,26 +73,36 @@ module Avo
     def get_attributes_for_action
       get_fields.map do |field|
         [field.id, field.value]
-      end
-        .to_h
+      end.to_h
     end
 
     def handle_action(**args)
       models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)
-      avo_fields = get_fields.map { |field| [field.id, field] }.to_h
+      # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
+      action_fields = get_field_definitions.map { |field| [field.id, field] }.to_h
+
+      # For some fields, like belongs_to, the id and database_id differ (user vs user_id).
+      # That's why we need to fetch the database_id for when we process the action.
+      action_fields_by_database_id = action_fields.map do |id, value|
+        [value.database_id.to_sym, value]
+      end.to_h
 
       if fields.present?
         processed_fields = fields.to_unsafe_h.map do |name, value|
-          [name, avo_fields[name.to_sym].resolve_attribute(value)]
+          field = action_fields_by_database_id[name.to_sym]
+
+          next if field.blank?
+
+          [name, field.resolve_attribute(value)]
         end
 
-        processed_fields = processed_fields.to_h
+        processed_fields = processed_fields.reject(&:blank?).to_h
       else
         processed_fields = {}
       end
 
       args = {
-        fields: processed_fields,
+        fields: processed_fields.with_indifferent_access,
         current_user: current_user,
         resource: resource
       }
@@ -175,6 +185,15 @@ module Avo
       self
     end
 
+    # We're overriding this method to hydrate with the proper resource attribute.
+    def hydrate_fields(model: nil, view: nil)
+      fields.map do |field|
+        field.hydrate(model: @model, view: @view, resource: resource)
+      end
+
+      self
+    end
+
     private
 
     def add_message(body, type = :info)

data/lib/avo/base_resource.rb

@@ -263,7 +263,7 @@ module Avo
           field.computed
         end
         .map do |field|
-          [field.database_id(model).to_s, field]
+          [field.database_id.to_s, field]
         end
         .to_h
 

data/lib/avo/base_resource_tool.rb

@@ -13,7 +13,7 @@ module Avo
 
     def initialize(**args)
       # Set the visibility
-      show_on :show
+      show_on Avo.configuration.resource_default_view
 
       show_on args[:show_on] if args[:show_on].present?
       hide_on args[:hide_on] if args[:hide_on].present?

data/lib/avo/configuration.rb

@@ -36,6 +36,7 @@ module Avo
     attr_accessor :profile_menu
     attr_accessor :model_resource_mapping
     attr_accessor :tabs_style
+    attr_accessor :resource_default_view
     attr_writer :branding
 
     def initialize
@@ -83,6 +84,7 @@ module Avo
       @profile_menu = nil
       @model_resource_mapping = {}
       @tabs_style = :tabs
+      @resource_default_view = :show
     end
 
     def current_user_method(&block)

data/lib/avo/fields/base_field.rb

@@ -191,7 +191,7 @@ module Avo
       end
 
       # Try to see if the field has a different database ID than it's name
-      def database_id(model)
+      def database_id
         foreign_key
       rescue
         id

data/lib/avo/fields/belongs_to_field.rb

@@ -210,7 +210,7 @@ module Avo
         model
       end
 
-      def database_id(model)
+      def database_id
         # If the field is a polymorphic value, return the polymorphic_type as key and pre-fill the _id in fill_field.
         return "#{polymorphic_as}_type" if polymorphic_as.present?
 

data/lib/avo/fields/has_and_belongs_to_many_field.rb

@@ -5,7 +5,7 @@ module Avo
         args[:updatable] = false
 
         hide_on :all
-        show_on :show
+        show_on Avo.configuration.resource_default_view
 
         super(id, **args, &block)
       end

data/lib/avo/fields/has_base_field.rb

@@ -30,7 +30,7 @@ module Avo
       end
 
       def resource
-        Avo::App.get_resource_by_model_name @model.class
+        @resource || Avo::App.get_resource_by_model_name(@model.class)
       end
 
       def turbo_frame
@@ -108,6 +108,10 @@ module Avo
       def frame_id
         use_resource.present? ? use_resource.route_key.to_sym : @id
       end
+
+      def default_view
+        Avo.configuration.skip_show_view ? :edit : :show
+      end
     end
   end
 end

data/lib/avo/fields/has_many_field.rb

@@ -5,7 +5,7 @@ module Avo
         args[:updatable] = false
 
         hide_on :all
-        show_on :show
+        show_on Avo.configuration.resource_default_view
 
         super(id, **args, &block)
       end

data/lib/avo/menu/base_item.rb

@@ -9,6 +9,7 @@ class Avo::Menu::BaseItem
   option :items, default: proc { [] }
   option :name, default: proc { "" }
   option :visible, default: proc { true }
+  option :data, default: proc { {} }
 
   def visible?
     return visible if visible.in? [true, false]

data/lib/avo/menu/builder.rb

@@ -22,9 +22,11 @@ class Avo::Menu::Builder
   end
 
   # Adds a link
-  def link(name, **args)
-    @menu.items << Avo::Menu::Link.new(name: name, **args)
+  def link(name, path = nil, **args)
+    path ||= args[:path]
+    @menu.items << Avo::Menu::Link.new(name: name, path: path, **args)
   end
+  alias_method :link_to, :link
 
   # Validates and adds a resource
   def resource(name, **args)

data/lib/avo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.15.3
+  version: 2.16.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails