avo 2.11.3.pre.1 → 2.11.3.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6322eef586c1cf132343d666fa513b2733699349d2945a86ddb2b37669cfcd1c
-  data.tar.gz: 5fb654449921d9fde5312adbeee074f96752445c34416ea4a6a22e6c5f9be9df
+  metadata.gz: a4af2bced12108d7f563a575286b2406816c124175702899f292ff70f037a1b2
+  data.tar.gz: 5dabe5c91bec202127a43a8314344fdf7e9b9dc6d44eb707df3deaf4bfac9cf3
 SHA512:
-  metadata.gz: 8c9ee8afe73d49806a42032b5c3f2b8c49a05763d44048e44c55ab4831d30c475ad2792cb6ad11ce5bd8ce296202c20173dd8bf274b05c64f6ac60174835953b
-  data.tar.gz: f22c15ebaaee96768cd5c38c2935a513410a32a5e46729b22c4c8375c1b7a229b4e3e733572f3fe47207229bae4775ce3a5510c528a532759c81b8b2b0b39fc7
+  metadata.gz: 4b80c8c9697ac3e295b020e3441544ea333fbd31ec21d8fe051cb5385d164cd7a991f714b1ad6c0e19a08bffcaa0eba66b8f1f32f177b49e7f4a6bc1a85ef575
+  data.tar.gz: b77b943063b6830d8371cc09748c85e7c7fef75fbcf4574c53d01cc2af956f510cbfdc2d0381f6cd41ceb38266ff1f226ead36a6ed37061bcd83256a6d256538

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.3.pre.1)
+    avo (2.11.3.pre.2)
       active_link_to
       addressable
       breadcrumbs_on_rails

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

@@ -3,9 +3,9 @@
   data-actions-picker-enabled-class="text-black hover:bg-blue-500 hover:text-white"
   data-actions-picker-disabled-class="cursor-wait text-gray-500"
 >
-  <%= a_button style: @style,
+  <%= a_button style: :outline,
     type: :button,
-    color: @color,
+    color: :primary,
     class: "focus:outline-none",
     icon: 'arrow-circle-right',
     icon_class: 'transform rotate-90',
@@ -18,7 +18,7 @@
     data-toggle-panel-target="panel"
   >
     <div class="w-full space divide-y">
-      <% actions.each_with_index do |action, index| %>
+      <% @actions.each_with_index do |action, index| %>
         <%= link_to action_path(action.param_id),
           data: {
             'turbo-frame': 'actions_show',

data/app/components/avo/actions_component.rb

@@ -3,23 +3,14 @@
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :blue)
-    @actions = actions || []
+  def initialize(actions: [], resource: nil, view: nil)
+    @actions = actions
     @resource = resource
     @view = view
-    @exclude = exclude
-    @color = color
-    @style = style
   end
 
   def render?
-    actions.present?
-  end
-
-  def actions
-    @actions.select do |action|
-      !action.class.in?(@exclude)
-    end
+    @actions.present?
   end
 
   # When running an action for one record we should do it on a special path.

data/app/components/avo/button_component.rb

@@ -43,7 +43,9 @@ class Avo::ButtonComponent < ViewComponent::Base
     classes = "button-component inline-flex flex-grow-0 items-center font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 border justify-center active:outline active:outline-1 #{@class}"
 
     classes += " rounded" if @rounded.present?
+
     classes += style_classes
+
     classes += horizontal_padding_classes
     classes += vertical_padding_classes
     classes += text_size_classes
@@ -149,7 +151,7 @@ class Avo::ButtonComponent < ViewComponent::Base
   def style_classes
     case @style
     when :primary
-      " bg-#{@color}-500 text-white border-#{@color}-500 hover:bg-#{@color}-600 hover:border-#{@color}-600 active:border-#{@color}-700 active:outline-#{@color}-700 active:bg-#{@color}-600"
+      " bg-primary-500 text-white border-primary-500 hover:bg-primary-600 hover:border-primary-600 active:border-primary-700 active:outline-primary-700 active:bg-primary-600"
     when :outline
       " bg-white text-#{@color}-500 border-#{@color}-500 hover:bg-#{@color}-100 active:bg-#{@color}-100 active:border-#{@color}-500 active:outline-#{@color}-500"
     when :text

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

@@ -1,19 +1,19 @@
 <div class="relative flex-1 flex flex-col justify-between h-full"
-  data-controller="dashboard-card"
-  data-dashboard-card-target="card"
+  data-controller="card"
+  data-card-target="card"
   data-refresh-every="<%= @card.refresh_every %>"
   data-card-id="<%= @card.id %>"
   data-card-index="<%= @card.index %>">
   <% if @card.class.display_header %>
     <div class="px-4 pt-4">
-      <div class="flex justify-between items-center min-h-6">
-          <div class="text-base font-bold text-gray-700 leading-none">
-            <%= @card.label %>
-          </div>
-        <div data-controller="select">
+      <div class="flex justify-between items-center">
+        <div class="text-sm font-bold text-gray-700 leading-none">
+          <%= @card.label %>
+        </div>
+        <div class="flex" data-controller="select">
           <% if @card.type.in?([:metric, :chartkick, :partial]) && @card.ranges.present? %>
             <%= select_tag "#{@card.id}_#{@card.index}_range", options_for_select(@card.ranges, @card.range),
-              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-sm text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 leading-tight border outline-none outline w-24',
+              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-xs text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 border outline-none outline w-24',
               data: {
                 target: 'select',
                 action: 'change->select#onChange'

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

@@ -0,0 +1,16 @@
+<%= content_tag(:div, class: "grid gap-4 grid-cols-1 #{parent.class.cards_classes}") do %>
+  <% parent.cards.each do |card| %>
+    <% if card.is_divider? %>
+      <%= render Avo::Dashboards::DividerComponent.new(divider: card) %>
+    <% elsif card.is_card? %>
+      <%= content_tag(:div, class: "relative bg-white rounded shadow-panel space-y-2 overflow-hidden h-full #{card.card_classes}") do %>
+        <turbo-frame id="<%= card.turbo_frame %>"
+          src="<%= card.frame_url(enforced_range: @range, params: params) %>"
+          data-card-index="<%= card.index %>"
+        >
+          <%= render(Avo::LoadingComponent.new(title: card.label)) %>
+        </turbo-frame>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/avo/cards_list_component.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Avo::CardsListComponent < ViewComponent::Base
+  attr_reader :parent
+
+  def initialize(parent: nil)
+    @parent = parent
+  end
+
+  def render?
+    parent.cards.present?
+  end
+end

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

@@ -17,7 +17,7 @@
         <% end %>
       </div>
       <% if tools.present? %>
-        <div class="flex-1 w-full flex flex-wrap flex-col sm:flex-row xl:justify-end sm:items-end gap-2 mt-4 xl:mt-0" data-target="panel-controls">
+        <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
           <%= tools %>
         </div>
       <% end %>

data/app/components/avo/resource_component.rb

@@ -22,12 +22,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
     authorize_association_for("detach")
   end
 
-  def detach_path
-    return "/" if @reflection.blank?
-
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
-  end
-
   def can_see_the_edit_button?
     @resource.authorization.authorize_action(:edit, raise_exception: false)
   end
@@ -36,6 +30,10 @@ class Avo::ResourceComponent < Avo::BaseComponent
     @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
+  def detach_path
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
+  end
+
   def destroy_path
     helpers.resource_path(model: @resource.model, resource: @resource)
   end

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

@@ -1,5 +1,5 @@
 <div
-  class="avo-sidebar fixed z-[60] t-0 application-sidebar w-64 flex-1 border-r lg:border-none bg-none h-[calc(100vh-4rem)] bg-gray-25 lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %> <%= @sidebar_open ? 'flex' : 'hidden' %>"
+  class="avo-sidebar fixed z-[60] t-0 application-sidebar w-64 flex-1 border-r lg:border-none bg-none h-[calc(100vh-4rem)] bg-application lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %> <%= @sidebar_open ? 'flex' : 'hidden' %>"
   data-sidebar-target="<%= stimulus_target %>"
   data-transition-enter="transition ease-out duration-100"
   data-transition-enter-start="transform opacity-0 -translate-x-full"

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

@@ -35,6 +35,26 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     @resource.authorization.authorize_action @view, raise_exception: false
   end
 
+  def is_edit?
+    view == :edit
+  end
+
+  def form_url
+    if is_edit?
+      helpers.resource_path(
+        model: @resource.model,
+        resource: @resource
+      )
+    else
+      helpers.resources_path(
+        resource: @resource,
+        via_relation_class: params[:via_relation_class],
+        via_relation: params[:via_relation],
+        via_resource_id: params[:via_resource_id]
+      )
+    end
+  end
+
   private
 
   def via_index?

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

@@ -1,17 +1,21 @@
 <%= content_tag :div,
+  class: 'space-y-6',
   data: {
     **@resource.stimulus_data_attributes
   } do %>
-  <%= render Avo::PanelComponent.new(title: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
-    <% c.tools do %>
-      <% if can_attach? %>
-        <%= a_link attach_path,
+  <%= render Avo::CardsListComponent.new parent: @resource %>
+  <%= content_tag :div, class: "space-y-12" do %>
+    <%= render Avo::PanelComponent.new(title: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
+      <% c.tools do %>
+        <% if can_attach? %>
+          <%= a_link attach_path,
           icon: 'heroicons/outline/link',
           color: :primary,
           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).capitalize %>
+          <% end %>
         <% end %>
       <% end %>
       <% if can_see_the_actions_button? %>
@@ -26,53 +30,97 @@
           <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
         <% end %>
       <% end %>
-    <% end %>
-    <% c.body do %>
-      <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' if @resource.search_query.nil? && @filters.empty? && available_view_types.count <= 1 %>"
+      <% c.body do %>
+        <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' if @resource.search_query.nil? && @filters.empty? && available_view_types.count <= 1 %>"
         data-selected-resources-name="<%= @resource.model_key %>"
         data-selected-resources="[]"
       >
-        <% if @resource.search_query.present? %>
-          <div class="flex items-center px-4 w-64">
-            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} %>
-          </div>
-        <% else %>
-          <%# Offset for the space-y-2 property when the search is missing %>
-          <div class="-mb-2"></div>
-        <% end %>
-        <% if @filters.present? || available_view_types.count > 1 %>
-          <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
-            <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters %>
-            <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
-          </div>
-        <% end %>
-      </div>
-      <% if view_type.to_sym == :table %>
-        <% if @resources.present? %>
-          <div class="w-full overflow-auto flex flex-col mt-0 mac-styled-scrollbar">
-            <div class="relative flex-1 flex">
-              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
+          <% if @resource.search_query.present? %>
+            <div class="flex items-center px-4 w-64">
+              <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} %>
             </div>
-          </div>
-        <% else %>
-          <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
+          <% else %>
+            <%# Offset for the space-y-2 property when the search is missing %>
+            <div class="-mb-2"></div>
+          <% end %>
+          <% if @filters.present? || available_view_types.count > 1 %>
+            <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
+              <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters %>
+              <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
+            </div>
+          <% end %>
+        </div>
+        <% if view_type.to_sym == :table %>
+          <% if @resources.present? %>
+            <div class="w-full overflow-auto flex flex-col mt-0 mac-styled-scrollbar">
+              <div class="relative flex-1 flex">
+                <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
+              </div>
+            </div>
+          <% else %>
+            <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
+          <% end %>
         <% end %>
       <% end %>
-    <% end %>
-    <% c.bare_content do %>
-      <% if view_type.to_sym == :table %>
-        <% if @models.present? %>
-          <div class="mt-4">
+      <% c.bare_content do %>
+        <% if view_type.to_sym == :table %>
+          <% if @models.present? %>
+            <div class="mt-4">
+              <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
+            </div>
+          <% end %>
+        <% end %>
+        <% if view_type.to_sym == :grid %>
+          <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
+          <div class="mt-6">
             <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
           </div>
+          <% if view_type.to_sym == :table %>
+            <% if @resources.present? %>
+              <div class="w-full overflow-auto flex flex-col mt-0">
+                <div class="relative flex-1 flex">
+                  <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
+                </div>
+              <% else %>
+                <%# Offset for the space-y-2 property when the serach is missing %>
+                <div class="-mb-2"></div>
+              <% end %>
+              <% if @filters.present? || available_view_types.count > 1 %>
+                <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
+                  <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters %>
+                  <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
+                </div>
+              <% end %>
+            </div>
+            <% if view_type.to_sym == :table %>
+              <% if @resources.present? %>
+                <div class="w-full overflow-auto flex flex-col mt-0">
+                  <div class="relative flex-1 flex">
+                    <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
+                  </div>
+                </div>
+              <% else %>
+                <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
+              <% end %>
+            <% end %>
+          <% end %>
+          <% c.bare_content do %>
+            <% if view_type.to_sym == :table %>
+              <% if @models.present? %>
+                <div class="mt-4">
+                  <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
+                </div>
+              <% end %>
+            <% end %>
+            <% if view_type.to_sym == :grid %>
+              <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
+              <div class="mt-6">
+                <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
+              </div>
+            <% end %>
+          <% end %>
         <% end %>
       <% end %>
-      <% if view_type.to_sym == :grid %>
-        <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
-        <div class="mt-6">
-          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
-        </div>
-      <% end %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -5,150 +5,63 @@
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
   } do %>
+  <div class="mb-6">
+    <%= render Avo::CardsListComponent.new parent: @resource %>
+  </div>
   <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
     <% c.tools do %>
-      <% if @resource.has_show_controls? %>
-        <% @resource.render_show_controls.each do |control| %>
-          <% if control.back_button? %>
-            <%= a_link back_path,
-                style: :text,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                },
-                icon: 'arrow-left' do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.delete_button? %>
-            <% if can_see_the_destroy_button? %>
-            <% end %>
-            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
-                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',
-                title: control.title,
-                data: {
-                  control: :destroy,
-                  tippy: control.title ? :tooltip : nil,
-                  'resource-id': @resource.model.id,
-                } do %>
-            <% end %>
-          <% elsif control.actions_list? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, style: control.style, color: control.color %>
-          <% elsif control.edit_button? %>
-            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-            <% end %>
-            <%= a_link edit_path,
-                color: :primary,
-                style: :primary,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                },
-                icon: 'edit' do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.action? %>
-            <%= a_link control.path,
-                color: control.color,
-                style: control.style,
-                icon: control.icon,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                  'turbo-frame': 'actions_show',
-                  'action': 'click->actions-picker#visitAction',
-                } do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.link_to? %>
-            <%= a_link control.path,
-                color: control.color,
-                style: control.style,
-                icon: control.icon,
-                title: control.title,
-                target: control.target,
-                class: control.class,
-                data: {
-                  **control.data,
-                  tippy: control.title ? :tooltip : nil,
-                } do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.detach_button? %>
-            <% if @reflection.present? && @resource.model.present? && can_detach? %>
-              <%= a_button url: detach_path,
-                  icon: 'detach',
-                  method: :delete,
-                  form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                  style: :text,
-                  data: {
-                    confirm: "Are you sure you want to detach this #{title}."
-                  } do %>
-                <%= t('avo.detach_item', item: title).capitalize %>
-              <% end %>
-            <% end %>
+      <% if @reflection.present? && @resource.model.present? %>
+        <% if can_detach? %>
+          <%= a_button url: detach_path,
+            icon: 'detach',
+            method: :delete,
+            form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+            style: :text,
+            data: {
+              confirm: "Are you sure you want to detach this #{title}."
+            } do %>
+            <%= t('avo.detach_item', item: title).capitalize %>
           <% end %>
         <% end %>
-      <% else %>
-        <% if @reflection.present? && @resource.model.present? %>
-          <% if can_detach? %>
-            <%= a_button url: detach_path,
-                icon: 'detach',
-                method: :delete,
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                style: :text,
-                data: {
-                  confirm: "Are you sure you want to detach this #{title}."
-                } do %>
-              <%= t('avo.detach_item', item: title).capitalize %>
-            <% end %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+        <% if can_see_the_edit_button? %>
+          <%= a_link edit_path,
+            color: :primary,
+            style: :primary,
+            icon: 'edit' do %>
+            <%= t('avo.edit').capitalize %>
           <% end %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-          <% if can_see_the_edit_button? %>
-            <%= a_link edit_path,
-                color: :primary,
-                style: :primary,
-                icon: 'edit' do %>
-              <%= t('avo.edit').capitalize %>
-            <% end %>
-          <% end %>
-        <% else %>
-          <%= a_link back_path,
+        <% end %>
+      <% else %>
+        <%= a_link back_path,
+          style: :text,
+          icon: 'arrow-left' do %>
+          <%= t('avo.go_back') %>
+        <% end %>
+        <% if can_see_the_destroy_button? %>
+          <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+            method: :delete,
+            local: true,
             style: :text,
-            icon: 'arrow-left' do %>
-            <%= t('avo.go_back') %>
+            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 %>
-          <% if can_see_the_destroy_button? %>
-            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
-                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 %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-          <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-            <%= a_link edit_path,
-              color: :primary,
-              style: :primary,
-              icon: 'edit' do %>
-              <%= t('avo.edit').capitalize %>
-            <% end %>
+        <% end %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+        <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
+          <%= a_link edit_path,
+            color: :primary,
+            style: :primary,
+            icon: 'edit' do %>
+            <%= t('avo.edit').capitalize %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -17,7 +17,6 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   def title
     if @reflection.present?
       return field.name if has_one_field?
-
       reflection_resource.name
     else
       @resource.default_panel_name

data/app/controllers/avo/application_controller.rb

@@ -118,7 +118,7 @@ module Avo
     def set_resource
       raise ActionController::RoutingError.new "No route matches" if resource.nil?
 
-      @resource = resource.hydrate(params: params)
+      @resource = resource
     end
 
     def set_related_resource
@@ -156,7 +156,7 @@ module Avo
     end
 
     def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user)
+      @resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model, params: params)
     end
 
     def hydrate_related_resource

data/app/controllers/avo/associations_controller.rb

@@ -6,8 +6,8 @@ module Avo
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_reflection_field
-    before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
     before_action :set_related_model, only: [:show, :order]
+    before_action :hydrate_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_reflection
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy, :order]