avo 2.11.1.pre.2 → 2.11.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc7baa68c6256d8c8a26e4a40be36129d1187451015bc72c0ec2be65c3acd8b
-  data.tar.gz: 57a8ef18222e622ed7d3f45334b46c97183d10ea845b321044648cd1974faf22
+  metadata.gz: 60431c5efb911209dd56de78864a1c68a8a3eba305041f645213cf56ae134d39
+  data.tar.gz: eccc5df0754aa8a0dff6428333cb618cbe4ddeaefb0bf4e41ec7289d5338cf15
 SHA512:
-  metadata.gz: 3df946571876e5742a86eb9314fe1122ea2838bedd0c3af3027e754df24ca20a4c9961e62c46f50a399c9265ddbf2b1f2cb9b2fd2ffb43e13bdcf6595634d71c
-  data.tar.gz: 7d9b4560a2069d752f5e82bc66c0d0eb4e1e9df5d95261371e859c8907741ac80a43a7ba09ce5ed6f59da316723b9f1ab9dbb8de3931f98113fc5de1c619ee74
+  metadata.gz: 553477576dc7c80f634a2cf2278143b6ba5668af418598160a5255f52be3ad04da78adc8c52a824ac70c48230a2470dd87a96604c83071f62f68ba89b59e865f
+  data.tar.gz: 9d5fbd770fc8e6e8609e17a72745325df0e5056c3354e87e24a6e9c17707c42073da5dccfd87aae914f368e3c3c1546e6d83328caa6db54db2e394e0882ebe07

data/Gemfile.lock

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

data/app/assets/stylesheets/avo.css

@@ -16,6 +16,7 @@
 @import './css/breadcrumbs.css';
 @import './css/search.css';
 @import './css/active-storage.css';
+@import './css/sidebar.css';
 @import './css/spinner.css';
 @import './css/tags.css';
 
@@ -69,10 +70,6 @@ body {
   @apply opacity-0 translate-y-1;
 }
 
-.application-sidebar .active:hover,
-.application-sidebar .active {
-  @apply bg-blue-100 text-blue-500;
-}
 
 .turbo-progress-bar {
   @apply bg-blue-400;

data/app/assets/stylesheets/css/sidebar.css

@@ -0,0 +1,18 @@
+.application-sidebar .active:hover,
+.application-sidebar .active {
+  @apply bg-blue-100 text-blue-500;
+}
+
+.content-area {
+  /* remove the left padding. */
+  .main-content-area {
+    @apply lg:pl-0;
+  }
+
+  &.sidebar-open {
+    /* Add padding to the main area to allow for the sidebar to expand. */
+    .main-content-area {
+      @apply lg:pl-64;
+    }
+  }
+}

data/app/assets/svgs/failed_to_load.svg

@@ -0,0 +1,15 @@
+<svg width="275" height="275" viewBox="0 0 275 275" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M137.714 274.227C213.377 274.227 274.714 212.89 274.714 137.227C274.714 61.5636 213.377 0.226593 137.714 0.226593C62.0512 0.226593 0.714233 61.5636 0.714233 137.227C0.714233 212.89 62.0512 274.227 137.714 274.227Z" fill="url(#paint0_linear_663_759)"/>
+<rect x="55.5142" y="67.8133" width="164.4" height="32.88" fill="white"/>
+<path d="M219.914 274.227H55.5142V97.0399C63.2629 97.0312 70.6918 93.9492 76.171 88.4701C81.6502 82.9909 84.7322 75.562 84.7409 67.8133H190.688C190.679 71.6518 191.432 75.4538 192.903 78.9994C194.374 82.5449 196.533 85.7636 199.256 88.4692C201.962 91.1929 205.181 93.353 208.727 94.8242C212.273 96.2953 216.075 97.0484 219.914 97.0399V274.227Z" fill="white"/>
+<path d="M137.714 186.547C161.926 186.547 181.554 166.919 181.554 142.707C181.554 118.494 161.926 98.8666 137.714 98.8666C113.502 98.8666 93.8743 118.494 93.8743 142.707C93.8743 166.919 113.502 186.547 137.714 186.547Z" fill="#4285F4"/>
+<path d="M153.214 163.373L137.714 147.874L122.214 163.373L117.048 158.207L132.548 142.707L117.048 127.207L122.214 122.041L137.714 137.54L153.214 122.041L158.381 127.207L142.881 142.707L158.381 158.207L153.214 163.373Z" fill="white"/>
+<path d="M161.461 197.507H113.968C110.941 197.507 108.488 199.96 108.488 202.987C108.488 206.013 110.941 208.467 113.968 208.467H161.461C164.487 208.467 166.941 206.013 166.941 202.987C166.941 199.96 164.487 197.507 161.461 197.507Z" fill="#DFEAFB"/>
+<path d="M177.901 219.427H97.5275C94.501 219.427 92.0475 221.88 92.0475 224.907C92.0475 227.933 94.501 230.387 97.5275 230.387H177.901C180.927 230.387 183.381 227.933 183.381 224.907C183.381 221.88 180.927 219.427 177.901 219.427Z" fill="#DFEAFB"/>
+<defs>
+<linearGradient id="paint0_linear_663_759" x1="137.714" y1="0.226593" x2="137.714" y2="274.227" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E3ECFA"/>
+<stop offset="1" stop-color="#DAE7FF"/>
+</linearGradient>
+</defs>
+</svg>

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

@@ -19,4 +19,8 @@
   <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% unless @displayed_in_modal %> px-6 <% end %>">
     <%= content %>
   </div>
+  <% if params[:avo_debug].present? %>
+    <!-- Raw value: -->
+    <!-- <%== @field.value.inspect %> -->
+  <% end %>
 <% end %>

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

@@ -7,7 +7,7 @@
     <% c.tools do %>
       <% if !@field.readonly && can_attach? %>
         <%= a_link attach_path, icon: 'heroicons/outline/link', color: :primary, 'data-turbo-frame': 'attach_modal' do %>
-          <%= t('avo.attach_item', item: @field.name) %>
+          <%= t('avo.attach_item', item: @field.name.downcase) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -4,19 +4,20 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   include Avo::ApplicationHelper
 
   def can_attach?
-    attach_policy = true
+    policy_result = true
+
     if @field.present?
       reflection_resource = @field.target_resource
       if reflection_resource.present? && @resource.present?
-        method_name = ("attach_#{reflection_resource.model_key}?").to_sym
-        defined_policy_methods = @resource.authorization.defined_methods(@resource.model_class, raise_exception: false)
+        method_name = "attach_#{@field.id}?".to_sym
 
-        if defined_policy_methods.present? && defined_policy_methods.include?(method_name)
-          attach_policy = @resource.authorization.authorize_action(method_name, raise_exception: false)
+        if @resource.authorization.has_method?(method_name, raise_exception: false)
+          policy_result = @resource.authorization.authorize_action(method_name, raise_exception: false)
         end
       end
     end
-    attach_policy
+
+    policy_result
   end
 
   def attach_path

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

@@ -1,6 +1,8 @@
 <%= index_field_wrapper field: @field, resource: @resource do %>
   <% if @field.as_html %>
     <%== @field.value %>
+  <% elsif @field.protocol.present? %>
+    <%= link_to @field.value, "#{@field.protocol}:#{@field.value}" %>
   <% else %>
     <%= link_to_if @field.link_to_resource, @field.value, resource_path %>
   <% end %>

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

@@ -1,6 +1,8 @@
 <%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
   <% if @field.as_html %>
     <%== @field.value %>
+  <% elsif @field.protocol.present? %>
+    <%= link_to @field.value, "#{@field.protocol}:#{@field.value}" %>
   <% else %>
     <%= @field.value %>
   <% end %>

data/app/components/avo/fields/trix_field/edit_component.rb

@@ -2,6 +2,6 @@
 
 class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
   def trix_id
-    "trix_#{@resource.name.underscore}_#{@field.id}"
+    "trix_#{@resource.class_name_without_resource.underscore}_#{@field.id}"
   end
 end

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

@@ -17,4 +17,8 @@
       <%= content %>
     <% end %>
   <% end %>
+  <% if params[:avo_debug].present? %>
+    <!-- Raw value: -->
+    <!-- <%== @field.value.inspect %> -->
+  <% end %>
 <% end %>

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

@@ -5,6 +5,7 @@
   <% if can_view? %>
     <%= link_to helpers.svg('eye', class: button_classes),
       show_path,
+      class: 'flex items-center',
       title: t('avo.view_item', item: singular_resource_name).capitalize,
       data: {
         target: 'control:view',
@@ -17,6 +18,7 @@
   <% if can_edit? %>
     <%= link_to helpers.svg('edit', class: button_classes),
       edit_path,
+      class: 'flex items-center',
       title: t('avo.edit_item', item: singular_resource_name).capitalize,
       data: {
         target: 'control:edit',
@@ -31,6 +33,7 @@
     <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id),
       method: :delete,
       local: true,
+      class: 'flex items-center',
       html: {
         'data-turbo-frame': params[:turbo_frame]
       } do |form| %>

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
-  def initialize(resource: nil, reflection: nil, parent_model: nil, view_type: :table)
+  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, view_type: :table)
     @resource = resource
     @reflection = reflection
     @parent_model = parent_model
+    @parent_resource = parent_resource
     @view_type = view_type
   end
 
@@ -12,7 +13,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     @reflection.present? &&
       @resource.model.present? &&
       is_has_many_association &&
-      authorize_association_for("detach")
+      authorize_association_for(:detach)
   end
 
   def can_edit?
@@ -22,8 +23,9 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_view?
-    return authorize_association_for(:view) if @reflection.present?
+    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.
     @resource.authorization.authorize_action(:show, raise_exception: false)
   end
 
@@ -42,7 +44,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def edit_path
     # Add the `view` param to let Avo know where to redirect back when the user clicks the `Cancel` button.
-    args = {via_view: 'index'}
+    args = {via_view: "index"}
 
     if @parent_model.present?
       args = {
@@ -73,6 +75,6 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def referrer_path
-    Avo::App.root_path(paths: ['resources', params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
+    Avo::App.root_path(paths: ["resources", params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
   end
 end

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

@@ -4,7 +4,7 @@
     <tbody class="divide-y">
       <% @resources.each_with_index do |resource, index| %>
         <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model), expires_in: 1.day do %>
-          <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model) %>
+          <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource) %>
         <% end %>
       <% end %>
     </tbody>

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

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

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

@@ -9,12 +9,21 @@
       </div>
     </td>
   <% end %>
+  <% if Avo.configuration.resource_controls_on_the_left? %>
+    <td class="text-right whitespace-nowrap px-2" data-control="resource-controls">
+      <div class="flex items-center justify-end flex-grow-0 h-full w-full">
+        <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, view_type: :table)) %>
+      </div>
+    </td>
+  <% end %>
   <% @resource.get_fields(reflection: @reflection, only_root: true).each_with_index do |field, index| %>
     <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model) %>
   <% end %>
-  <td class="text-right whitespace-nowrap px-2">
-    <div class="flex items-center justify-end flex-grow-0 h-full w-full">
-      <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, view_type: :table)) %>
-    </div>
-  </td>
+  <% if Avo.configuration.resource_controls_on_the_right? %>
+    <td class="text-right whitespace-nowrap px-2" data-control="resource-controls">
+      <div class="flex items-center justify-end flex-grow-0 h-full w-full">
+        <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, view_type: :table)) %>
+      </div>
+    </td>
+  <% end %>
 </tr>

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

@@ -3,9 +3,10 @@
 class Avo::Index::TableRowComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
-  def initialize(resource: nil, reflection: nil, parent_model: nil)
+  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
     @resource = resource
     @reflection = reflection
     @parent_model = parent_model
+    @parent_resource = parent_resource
   end
 end

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

@@ -1,6 +1,6 @@
 <% if item.is_tool? %>
   <% if item&.partial.present? %>
-    <%= render item.partial, tool: item %>
+    <%= render item.partial, tool: item, form: @form %>
   <% end %>
 <% elsif item.is_panel? %>
   <%= render Avo::PanelComponent.new(title: item.name, description: item.description, index: index, view: view) do |c| %>

data/app/components/avo/resource_component.rb

@@ -39,23 +39,29 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def authorize_association_for(policy_method)
-    association_policy = true
+    policy_result = true
 
     if @reflection.present?
+      # Fetch the appropiate resource
       reflection_resource = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name)
+      # Fetch the model
+      # Hydrate the resource with the model if we have one
       reflection_resource.hydrate(model: @parent_model) if @parent_model.present?
-      association_name = params["related_name"]
+      # Use the related_name as the base of the association
+      association_name = @reflection.name
 
       if association_name.present?
         method_name = "#{policy_method}_#{association_name}?".to_sym
+        # Prepare the authorization service
+        service = reflection_resource.authorization
 
-        if reflection_resource.authorization.has_method?(method_name, raise_exception: false)
-          association_policy = reflection_resource.authorization.authorize_action(method_name, raise_exception: false)
+        if service.has_method?(method_name, raise_exception: false)
+          policy_result = service.authorize_action(method_name, raise_exception: false)
         end
       end
     end
 
-    association_policy
+    policy_result
   end
 
   def main_panel

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

@@ -1,6 +1,12 @@
 <div
-  class="fixed z-[60] t-0 application-sidebar w-64 hidden lg:flex 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 %>"
-  data-mobile-target="sidebar"
+  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' %>"
+  data-sidebar-target="<%= stimulus_target %>"
+  data-transition-enter="transition ease-out duration-100"
+  data-transition-enter-start="transform opacity-0 -translate-x-full"
+  data-transition-enter-end="transform opacity-100 translate-x-0"
+  data-transition-leave="transition ease-in duration-75"
+  data-transition-leave-start="transform opacity-100 translate-x-0"
+  data-transition-leave-end="transform opacity-0 -translate-x-full"
 >
   <div class="flex flex-col w-full h-full">
     <div class="flex-1 flex flex-col justify-between overflow-auto h-full pt-3 scroll-shadows">

data/app/components/avo/sidebar_component.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::SidebarComponent < ViewComponent::Base
+  def initialize(sidebar_open: nil, for_mobile: false)
+    @sidebar_open = sidebar_open
+    @for_mobile = for_mobile
+  end
+
   def dashboards
     Avo::App.dashboards_for_navigation
   end
@@ -12,4 +17,8 @@ class Avo::SidebarComponent < ViewComponent::Base
   def tools
     Avo::App.tools_for_navigation
   end
+
+  def stimulus_target
+    @for_mobile ? "mobileSidebar" : "sidebar"
+  end
 end

data/app/components/avo/tab_switcher_component.rb

@@ -80,6 +80,10 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
         visible = item.visible?
       end
 
+      if item.respond_to?(:authorized?)
+        visible = item.authorized?
+      end
+
       visible
     end
   end

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

@@ -22,12 +22,10 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
       helpers.resource_path(model: params[:via_resource_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
     elsif via_index?
       helpers.resources_path(resource: @resource)
-    else # via resource show page
-      if is_edit?
-        helpers.resource_path(model: @resource.model, resource: @resource)
-      else
-        helpers.resources_path(resource: @resource)
-      end
+    elsif is_edit? # via resource show page
+      helpers.resource_path(model: @resource.model, resource: @resource)
+    else
+      helpers.resources_path(resource: @resource)
     end
   end
 

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

@@ -51,7 +51,7 @@
         <% 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)) %>
+              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
             </div>
           </div>
         <% else %>

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

@@ -15,6 +15,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     reflection: nil,
     turbo_frame: "",
     parent_model: nil,
+    parent_resource: nil,
     applied_filters: []
   )
     @resource = resource
@@ -27,6 +28,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @reflection = reflection
     @turbo_frame = turbo_frame
     @parent_model = parent_model
+    @parent_resource = parent_resource
     @applied_filters = applied_filters
     @view = :index
   end
@@ -52,7 +54,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   # The Create button is dependent on the new? policy method.
   # The create? should be called only when the user clicks the Save button so the developers gets access to the params from the form.
   def can_see_the_create_button?
-    return authorize_association_for("create") if @reflection.present?
+    return authorize_association_for(:create) if @reflection.present?
 
     @resource.authorization.authorize_action(:new, raise_exception: false) && !has_reflection_and_is_read_only
   end
@@ -60,7 +62,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def can_see_the_actions_button?
     return false if @actions.blank?
 
-    return authorize_association_for("act_on") if @reflection.present?
+    return authorize_association_for(:act_on) if @reflection.present?
 
     @resource.authorization.authorize_action(:act_on, raise_exception: false) && !has_reflection_and_is_read_only
   end
@@ -69,7 +71,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     klass = @reflection
     klass = @reflection.through_reflection if klass.is_a? ::ActiveRecord::Reflection::ThroughReflection
 
-    @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for("attach")
+    @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for(:attach)
   end
 
   def has_reflection_and_is_read_only

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

@@ -19,8 +19,8 @@
             } do %>
             <%= t('avo.detach_item', item: title).capitalize %>
           <% end %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
         <% end %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
         <% if can_see_the_edit_button? %>
           <%= a_link edit_path,
             color: :primary,

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

@@ -4,11 +4,13 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, reflection: nil, parent_model: nil, resource_panel: nil, actions: [])
+  def initialize(resource: nil, reflection: nil, parent_resource: nil, parent_model: nil, resource_panel: nil, actions: [])
     @resource = resource
     @reflection = reflection
     @resource_panel = resource_panel
     @actions = actions
+    @parent_model = parent_model
+    @parent_resource = parent_resource
     @view = :show
   end
 

data/app/controllers/avo/application_controller.rb

@@ -21,6 +21,7 @@ module Avo
     before_action :set_container_classes
     before_action :add_initial_breadcrumbs
     before_action :set_view
+    before_action :set_sidebar_open
 
     rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
@@ -129,7 +130,11 @@ module Avo
     end
 
     def set_related_model
-      @related_model = eager_load_files(@related_resource, @related_resource.class.find_scope).find params[:related_id]
+      @related_model = if @field.is_a? Avo::Fields::HasOneField
+        @model.send params[:related_name]
+      else
+        eager_load_files(@related_resource, @model.send(params[:related_name])).find params[:related_id]
+      end
     end
 
     def set_view
@@ -146,7 +151,7 @@ module Avo
       is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
 
       unless is_attach_action
-        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params), extra_params: extra_params)
       end
     end
 
@@ -155,15 +160,20 @@ module Avo
     end
 
     def hydrate_related_resource
-      @related_resource.hydrate(view: action_name.to_sym, user: _current_user)
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
     end
 
-    def authorize_action
-      if @model.present?
-        @authorization.set_record(@model).authorize_action action_name.to_sym
-      else
-        @authorization.set_record(@resource.model_class).authorize_action action_name.to_sym
-      end
+    def authorize_base_action
+      class_to_authorize = @model || @resource.model_class
+
+      authorize_action class_to_authorize
+    end
+
+    def authorize_action(class_to_authorize, action = nil)
+      # Use the provided action or figure it out from the request
+      action_to_authorize = action || action_name
+
+      @authorization.set_record(class_to_authorize).authorize_action action_to_authorize.to_sym
     end
 
     # Get the pluralized resource name for this request
@@ -310,10 +320,15 @@ module Avo
 
     def default_url_options
       if params[:force_locale].present?
-        { **super, force_locale: params[:force_locale] }
+        {**super, force_locale: params[:force_locale]}
       else
         super
       end
     end
+
+    def set_sidebar_open
+      value = cookies["#{Avo::COOKIES_KEY}.sidebar.open"]
+      @sidebar_open = value.blank? || value == "1"
+    end
   end
 end