avo 2.11.1.pre.3 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 794b7326ae2257afd693641ff51ba513d09d4729a77a671a96f1291f0b31b8e3
-  data.tar.gz: a3b8b5d2f19e9ac16164ae6cb634a0f53d92da7af1b4bc3c829704327f112c91
+  metadata.gz: 11bec5c585fbc251c7b9179b2494d3d05d7e52c8d1d26aa1113552f90e448bea
+  data.tar.gz: 66c973b9884dd4bf734a45ae957e572ecdc3c1bcf55056d5538907f52c356c3f
 SHA512:
-  metadata.gz: 15b95f8cef9a7ec9af6a272dd2abddbb7d8471f5edefb568b16e84f3b26165f7ac4f913974d70291463c8fcbc4427d7608a41a01c0167864d0368178ebf1e755
-  data.tar.gz: 7a7b600d0cc554e8aa30377199dad939e82c8165310b9f81cfe911c06a4d3cac3c72617fdad432475cd61bfcb60a1d00ee5ba4101a2d204940f48f6c6f03ba72
+  metadata.gz: 42fd910ec4e63622c2693e52a5bab127c1e46d0ce4f59f1c3e4507bd186f63fe8563b8b5ce2d65a84823b8e96cbb6c804e3df0db9e50444e507f84655b1e8bcb
+  data.tar.gz: b66101cb139f742cff2856ab83081280096325aeb421ac4698d9542c8b5bd985313f91db43a7454ac1dbb05ec30de384bb447df49693c140a6ff3db705f05b11

data/Gemfile.lock

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

data/app/assets/stylesheets/avo.css

@@ -16,7 +16,6 @@
 @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';
 
@@ -70,6 +69,10 @@ 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/components/avo/fields/date_field/show_component.html.erb

@@ -5,9 +5,5 @@
     date_field_format_value: @field.format,
   } do %>
     <%= @field.formatted_value %>
-    <% if params[:avo_debug].present? %>
-      <!-- Raw value: -->
-      <!-- <%= @field.formatted_value.inspect %> -->
-    <% end %>
   <% 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.downcase) %>
+          <%= t('avo.attach_item', item: @field.name) %>
         <% end %>
       <% end %>
     <% end %>

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

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

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

@@ -1,8 +1,6 @@
 <%= 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,8 +1,6 @@
 <%= 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/index/field_wrapper_component.html.erb

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

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

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
-  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, view_type: :table)
+  def initialize(resource: nil, reflection: nil, parent_model: nil, view_type: :table)
     @resource = resource
     @reflection = reflection
     @parent_model = parent_model
-    @parent_resource = parent_resource
     @view_type = view_type
   end
 
@@ -13,7 +12,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?
@@ -23,9 +22,8 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_view?
-    return authorize_association_for(:show) if @reflection.present?
+    return authorize_association_for(:view) 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
 
@@ -44,7 +42,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 = {
@@ -75,6 +73,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, parent_resource: @parent_resource) %>
+          <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model) %>
         <% end %>
       <% end %>
     </tbody>

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

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceTableComponent < ViewComponent::Base
-  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
+  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: 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

@@ -14,7 +14,7 @@
   <% 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, parent_resource: @parent_resource, view_type: :table)) %>
+      <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, view_type: :table)) %>
     </div>
   </td>
 </tr>

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

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

data/app/components/avo/resource_component.rb

@@ -39,29 +39,23 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def authorize_association_for(policy_method)
-    policy_result = true
+    association_policy = 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?
-      # Use the related_name as the base of the association
-      association_name = @reflection.name
+      association_name = params["related_name"]
 
       if association_name.present?
         method_name = "#{policy_method}_#{association_name}?".to_sym
-        # Prepare the authorization service
-        service = reflection_resource.authorization
 
-        if service.has_method?(method_name, raise_exception: false)
-          policy_result = service.authorize_action(method_name, raise_exception: false)
+        if reflection_resource.authorization.has_method?(method_name, raise_exception: false)
+          association_policy = reflection_resource.authorization.authorize_action(method_name, raise_exception: false)
         end
       end
     end
 
-    policy_result
+    association_policy
   end
 
   def main_panel

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

@@ -1,6 +1,6 @@
 <div
-  class="avo-sidebar 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-sidebar-target="sidebar"
+  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"
 >
   <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/tab_switcher_component.rb

@@ -80,10 +80,6 @@ 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,10 +22,12 @@ 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)
-    elsif is_edit? # via resource show page
-      helpers.resource_path(model: @resource.model, resource: @resource)
-    else
-      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
     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, parent_resource: @parent_resource)) %>
+              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
             </div>
           </div>
         <% else %>

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

@@ -15,7 +15,6 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     reflection: nil,
     turbo_frame: "",
     parent_model: nil,
-    parent_resource: nil,
     applied_filters: []
   )
     @resource = resource
@@ -28,7 +27,6 @@ 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
@@ -54,7 +52,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
@@ -62,7 +60,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
@@ -71,7 +69,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,13 +4,11 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, reflection: nil, parent_resource: nil, parent_model: nil, resource_panel: nil, actions: [])
+  def initialize(resource: nil, reflection: 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,7 +21,6 @@ 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
@@ -130,11 +129,7 @@ module Avo
     end
 
     def set_related_model
-      @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
+      @related_model = eager_load_files(@related_resource, @related_resource.class.find_scope).find params[:related_id]
     end
 
     def set_view
@@ -160,20 +155,15 @@ module Avo
     end
 
     def hydrate_related_resource
-      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
-    end
-
-    def authorize_base_action
-      class_to_authorize = @model || @resource.model_class
-
-      authorize_action class_to_authorize
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user)
     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
+    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
     end
 
     # Get the pluralized resource name for this request
@@ -320,15 +310,10 @@ 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

data/app/controllers/avo/associations_controller.rb

@@ -5,16 +5,12 @@ module Avo
     before_action :set_model, only: [:show, :index, :new, :create, :destroy, :order]
     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 :hydrate_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_model, only: [:show, :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]
     before_action :set_attachment_model, only: [:create, :destroy, :order]
-    before_action :authorize_index_action, only: :index
-    before_action :authorize_attach_action, only: :new
-    before_action :authorize_detach_action, only: :destroy
+    before_action :set_reflection, only: [:index, :show, :order]
 
     def index
       @parent_resource = @resource.dup
@@ -32,8 +28,6 @@ module Avo
     end
 
     def show
-      @parent_resource, @parent_model = @resource, @model
-
       @resource, @model = @related_resource, @related_model
 
       super
@@ -42,6 +36,12 @@ module Avo
     def new
       @resource.hydrate(model: @model)
 
+      begin
+        @field = @resource.get_field_definitions.find { |f| f.id == @related_resource_name.to_sym }
+        @field.hydrate(resource: @resource, model: @model, view: :new)
+      rescue
+      end
+
       if @field.present? && !@field.searchable
         query = @authorization.apply_policy @attachment_class
 
@@ -93,12 +93,8 @@ module Avo
 
     private
 
-    def set_reflection
-      @reflection = @model._reflections[params[:related_name].to_s]
-    end
-
     def set_attachment_class
-      @attachment_class = @reflection.klass
+      @attachment_class = @model._reflections[params[:related_name].to_s].klass
     end
 
     def set_attachment_resource
@@ -106,13 +102,11 @@ module Avo
     end
 
     def set_attachment_model
-      @attachment_model = @attachment_class.find attachment_id
+      @attachment_model = @model._reflections[params[:related_name].to_s].klass.find attachment_id
     end
 
-    def set_reflection_field
-      @field = @resource.get_field_definitions.find { |f| f.id == @related_resource_name.to_sym }
-      @field.hydrate(resource: @resource, model: @model, view: :new)
-    rescue
+    def set_reflection
+      @reflection = @model._reflections[params[:related_name].to_s]
     end
 
     def attachment_id
@@ -127,25 +121,5 @@ module Avo
 
       klass
     end
-
-    def authorize_if_defined(method)
-      @authorization.set_record(@model)
-
-      if @authorization.has_method?(method.to_sym)
-        @authorization.authorize_action method.to_sym
-      end
-    end
-
-    def authorize_index_action
-      authorize_if_defined "view_#{@field.id}?"
-    end
-
-    def authorize_attach_action
-      authorize_if_defined "attach_#{@field.id}?"
-    end
-
-    def authorize_detach_action
-      authorize_if_defined "detach_#{@field.id}?"
-    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -10,8 +10,7 @@ module Avo
     before_action :set_model_to_fill
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
-    # Don't run base authorizations for associations
-    before_action :authorize_base_action, if: -> {controller_name != "associations"}
+    before_action :authorize_action
 
     def index
       @page_title = @resource.plural_name.humanize

data/app/javascript/js/controllers/mobile_controller.js

@@ -0,0 +1,9 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ['sidebar']
+
+  toggleSidebar() {
+    this.sidebarTarget.classList.toggle('hidden')
+  }
+}

data/app/javascript/js/controllers.js

@@ -16,6 +16,7 @@ import ItemSelectorController from './controllers/item_selector_controller'
 import KeyValueController from './controllers/fields/key_value_controller'
 import LoadingButtonController from './controllers/loading_button_controller'
 import MenuController from './controllers/menu_controller'
+import MobileController from './controllers/mobile_controller'
 import ModalController from './controllers/modal_controller'
 import MultipleSelectFilterController from './controllers/multiple_select_filter_controller'
 import PerPageController from './controllers/per_page_controller'
@@ -25,7 +26,6 @@ import ResourceShowController from './controllers/resource_show_controller'
 import SearchController from './controllers/search_controller'
 import SelectController from './controllers/select_controller'
 import SelectFilterController from './controllers/select_filter_controller'
-import SidebarController from './controllers/sidebar_controller'
 import SimpleMdeController from './controllers/fields/simple_mde_controller'
 import TabsController from './controllers/tabs_controller'
 import TagsFieldController from './controllers/fields/tags_field_controller'
@@ -46,6 +46,7 @@ application.register('item-select-all', ItemSelectAllController)
 application.register('item-selector', ItemSelectorController)
 application.register('loading-button', LoadingButtonController)
 application.register('menu', MenuController)
+application.register('mobile', MobileController)
 application.register('modal', ModalController)
 application.register('multiple-select-filter', MultipleSelectFilterController)
 application.register('per-page', PerPageController)
@@ -55,7 +56,6 @@ application.register('resource-show', ResourceShowController)
 application.register('search', SearchController)
 application.register('select', SelectController)
 application.register('select-filter', SelectFilterController)
-application.register('sidebar', SidebarController)
 application.register('tabs', TabsController)
 application.register('tags-field', TagsFieldController)
 application.register('text-filter', TextFilterController)

data/app/views/avo/base/index.html.erb

@@ -10,7 +10,6 @@
       reflection: @reflection,
       turbo_frame: params[:turbo_frame],
       parent_model: @parent_model,
-      parent_resource: @parent_resource,
       applied_filters: @applied_filters,
     )
   %>

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

@@ -1,9 +1,3 @@
 <%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
-  <%= render Avo::Views::ResourceShowComponent.new(
-    resource: @resource,
-    reflection: @reflection,
-    actions: @actions,
-    parent_model: @parent_model,
-    parent_resource: @parent_resource,
-  ) %>
+  <%= render Avo::Views::ResourceShowComponent.new(resource: @resource, reflection: @reflection, actions: @actions) %>
 <% end %>

data/app/views/avo/partials/_javascript.html.erb

@@ -3,5 +3,4 @@
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
   Avo.configuration.root_path = '<%= root_path_without_url %>'
   Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
-  Avo.configuration.cookies_key = '<%= Avo::COOKIES_KEY %>'
 <% end %>

data/app/views/avo/partials/_navbar.html.erb

@@ -2,11 +2,8 @@
   class="fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-4 border-b space-x-4 lg:space-x-0 h-16 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
   v-if="layout !== 'blank'"
 >
-  <div class="flex items-center space-x-2 w-auto lg:w-64 flex-shrink-0 h-full">
-    <div>
-      <%= a_button class: 'lg:hidden', icon: 'menu', size: :xs, compact: true, style: :text, data: { action: 'click->sidebar#toggleSidebarOnMobile' } %>
-      <%= a_button class: 'hidden lg:block', icon: 'menu', size: :xs, compact: true, style: :text, data: { action: 'click->sidebar#toggleSidebar' } %>
-    </div>
+  <div class="flex items-center space-x-2 lg:space-x-0 w-auto lg:w-64 flex-shrink-0 h-full">
+    <%= a_button class: 'lg:hidden', icon: 'menu', size: :xs, compact: true, style: :text, data: { action: 'click->mobile#toggleSidebar' } %>
     <%= render partial: "avo/partials/logo" %>
   </div>
   <div class="flex-1 flex items-center justify-between lg:justify-start space-x-2 sm:space-x-8 lg:pl-4">