avo 3.0.0.pre13 → 3.0.0.pre14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf17f6b86663450788938a16475eba907f1a85a400f72d0efd58b59baea131c
-  data.tar.gz: be6d1682124dfbc7a0fdbff863b80caab538b7fdf28768d463169f2acd2fd086
+  metadata.gz: d0b96922b610c34442f4ef39940c378a6b5acc2638954c7eae30217fcfef32c4
+  data.tar.gz: '092dfa026329552be2be791d9493b4c0ca8db46caf72f7bb494e59aceab32275'
 SHA512:
-  metadata.gz: 6c47148a510c188098e524e70c1f7782fdb6fdb0ad8592f6d1e7cdf44fb175c6973db23f4672e2361be971639a5943c44309ea69409967ebe427fc558d90367c
-  data.tar.gz: f065601a617923ac787e0d468276d379f2cfd8798f34c9bdd604ed3a8df7c0722ded2f1013a121b0d69c9d75c85ae0b38ed7a61c745509c83264ca1502f8c9b3
+  metadata.gz: d1a47cfffce993596d1fd2edb977c4207ced53a597e174917848f69d3586a8d337dfcf7b131c4720cef4119ce5ff8d16577304533c4776e3e807b6307606396c
+  data.tar.gz: 94699f2123e35d23c0572d73137c86e025fa493c6f0637d9b7ea04ecbb93daef27ecaac42e818f3cdf01aba2dc2420aed7b18de6bb72cd87d8995afb29026ad1

data/Gemfile

@@ -162,7 +162,7 @@ gem "sprockets-rails"
 gem "image_processing", "~> 1.12"
 
 # source "https://rubygems.pkg.github.com/avo-hq" do
-#   gem "avo_filters"
+#   gem "avo-dynamic_filters"
 # end
 gem "prefixed_ids"
 

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    avo (3.0.0.pre13)
+    avo (3.0.0.pre14)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
+      activesupport (>= 6.1)
       addressable
       docile
       dry-initializer

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

@@ -10,7 +10,7 @@
       </div>
       <div class="ml-3 w-0 flex-1 pt-0.5">
         <p class="text-sm leading-5 font-semibold">
-          <%= sanitize message %>
+          <%= sanitize message.to_s %>
         </p>
       </div>
       <div class="ml-4 flex-shrink-0 flex items-center">

data/app/components/avo/base_component.rb

@@ -4,7 +4,7 @@ class Avo::BaseComponent < ViewComponent::Base
   include Turbo::FramesHelper
 
   def has_with_trial(ability)
-    ::Avo::App.license.has_with_trial(ability)
+    Avo.license.has_with_trial(ability)
   end
 
   private
@@ -18,7 +18,7 @@ class Avo::BaseComponent < ViewComponent::Base
 
   # Fetch the resource and hydrate it with the record
   def association_resource
-    resource = ::Avo::App.resources.get_resource(params[:via_resource_class])
+    resource = Avo.resource_manager.get_resource(params[:via_resource_class])
 
     model_class = if params[:via_relation_class].present?
       ::Avo::BaseResource.get_model_by_name params[:via_relation_class]
@@ -26,23 +26,23 @@ class Avo::BaseComponent < ViewComponent::Base
       resource.model_class
     end
 
-    resource = ::Avo::App.resources.get_resource_by_model_class model_class if resource.blank?
+    resource = Avo.resource_manager.get_resource_by_model_class model_class if resource.blank?
 
     record = resource.find_record params[:via_record_id], query: model_class, params: params
 
-    resource.dup.hydrate record: record
+    resource.new record: record
   end
 
   # Get the resource for the resource using the klass attribute so we get the namespace too
   def reflection_resource
-    ::Avo::App.resources.get_resource_by_model_class(@reflection.klass.to_s)
+    Avo.resource_manager.get_resource_by_model_class(@reflection.klass.to_s)
   rescue
     nil
   end
 
   # Get the resource for the resource using the klass attribute so we get the namespace too
   def reflection_parent_resource
-    ::Avo::App.resources.get_resource_by_model_class(@reflection.active_record.to_s)
+    Avo.resource_manager.get_resource_by_model_class(@reflection.active_record.to_s)
   rescue
     nil
   end
@@ -51,7 +51,7 @@ class Avo::BaseComponent < ViewComponent::Base
     return @resource unless link_to_child_resource_is_enabled?
     return @resource if @resource.record.class.base_class == @resource.record.class
 
-    ::Avo::App.resources.get_resource_by_model_class(@resource.record.class).dup || @resource
+    Avo.resource_manager.get_resource_by_model_class(@resource.record.class) || @resource
   end
 
   def link_to_child_resource_is_enabled?

data/app/components/avo/field_wrapper_component.rb

@@ -43,7 +43,7 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   end
 
   def classes(extra_classes = "")
-    "field-wrapper relative flex flex-col flex-grow pb-2 md:pb-0 leading-tight min-h-14 #{stacked? ? "field-wrapper-layout-stacked" : "field-wrapper-layout-inline md:flex-row md:items-center"} #{compact? ? "field-wrapper-size-compact" : "field-wrapper-size-regular"} #{full_width? ? "field-width-full" : "field-width-regular"} #{@classes || ""} #{extra_classes || ""} #{@field.get_html(:classes, view: view, element: :wrapper)}"
+    "field-wrapper relative flex flex-col grow pb-2 md:pb-0 leading-tight min-h-14 h-full #{stacked? ? "field-wrapper-layout-stacked" : "field-wrapper-layout-inline md:flex-row md:items-center"} #{compact? ? "field-wrapper-size-compact" : "field-wrapper-size-regular"} #{full_width? ? "field-width-full" : "field-width-regular"} #{@classes || ""} #{extra_classes || ""} #{@field.get_html(:classes, view: view, element: :wrapper)}"
   end
 
   def style

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

@@ -1,7 +1,7 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.text_field field.id,
-    class: classes("w-full"),
     value: field.value.to_s,
+    class: classes("w-full"),
     placeholder: field.placeholder,
     disabled: disabled? %>
 <% end %>

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

@@ -2,7 +2,7 @@
   <%
     # Set the model keys so we can pass them over
     model_keys = @field.types.map do |type|
-      resource = Avo::App.resources.get_resource_by_model_class(type.to_s)
+      resource = Avo.resource_manager.get_resource_by_model_class(type.to_s)
       [type.to_s, resource.model_key]
     end.to_h
   %>
@@ -13,7 +13,7 @@
     data-association-class="<%= @field&.target_resource&.model_class || nil %>"
   >
     <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
-      <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [::Avo::App.resources.get_resource_by_model_class(type.to_s).name, type.to_s] },
+      <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
       {
         value: @field.value,
         include_blank: @field.placeholder,
@@ -40,9 +40,9 @@
         data-belongs-to-field-target="type"
         data-type="<%= type %>"
       >
-        <%= field_wrapper **field_wrapper_args, label: ::Avo::App.resources.get_resource_by_model_class(type.to_s).name do %>
+        <%= field_wrapper **field_wrapper_args, label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
           <% if @field.is_searchable? %>
-            <%= render AvoPro::SearchableAssociations::AutocompleteComponent.new form: @form,
+            <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
               disabled: disabled,
               field: @field,
               foreign_key: @field.id_input_foreign_key,
@@ -81,7 +81,7 @@
 <% else %>
   <%= field_wrapper **field_wrapper_args do %>
     <% if @field.is_searchable? %>
-      <%= render AvoPro::SearchableAssociations::AutocompleteComponent.new form: @form,
+      <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
         field: @field,
         model_key: @field.target_resource&.model_key,
         foreign_key: @field.id_input_foreign_key,

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
-  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false, **args)
-    super field: field, resource: resource, index: index, form: form, compact: compact, **args
+  def initialize(...)
+    super(...)
 
     @polymorphic_record = nil
   end
@@ -32,7 +32,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   end
 
   def polymorphic_resource
-    Avo::App.resources.get_resource_by_model_class(polymorphic_class)
+    Avo.resource_manager.get_resource_by_model_class(polymorphic_class)
   end
 
   # Get the polymorphic id
@@ -60,6 +60,6 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   private
 
   def visit_through_association?
-    @field.target_resource.class.to_s == params[:via_resource_class].to_s
+    @field.target_resource.to_s == params[:via_resource_class].to_s
   end
 end

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

@@ -1,6 +1,7 @@
 <%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
   <div class="h-8 flex items-center">
     <%= @form.check_box @field.id,
+      value: @field.value,
       checked: @field.value,
       class: "text-lg h-4 w-4 checked:bg-primary-400 focus:checked:!bg-primary-400 rounded #{@field.get_html(:classes, view: view, element: :input)}",
       data: @field.get_html(:data, view: view, element: :input),

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

@@ -2,7 +2,7 @@
   <div class="flex items-center">
     <div class="space-y-2">
       <% model_param_key = model_name_from_record_or_class(@resource.record).param_key %>
-      <%= check_box_tag "#{model_name_from_record_or_class(@resource.record).param_key}[#{@field.id}][]", '', true, { class: "hidden" } %>
+      <%= check_box_tag "#{model_param_key}[#{@field.id}][]", '', true, { class: "hidden" } %>
       <% @field.options.each do |id, label| %>
         <%
           checked = false

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

@@ -1,6 +1,7 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
   <div data-controller="code-field">
     <%= @form.text_area @field.id,
+      value: @field.value,
       class: classes("w-full"),
       data: {
         'code-field-target': 'element',

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

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.select @field.id, @field.select_options, {
+      value: @field.value,
       selected: @field.value,
       include_blank: @field.include_blank
     },

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

@@ -6,10 +6,10 @@ class Avo::Fields::FileField::IndexComponent < Avo::Fields::IndexComponent
   end
 
   def has_image_tag?
-    @field.value.attached? && @field.value.representable? && @field.is_image
+    field.value.present? && field.value.attached? && field.value.representable? && field.is_image
   end
 
   def has_audio_tag?
-    @field.value.attached? && @field.is_audio
+    field.value.present? && field.value.attached? && field.is_audio
   end
 end

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

@@ -9,6 +9,7 @@
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
           color: :primary,
+          style: :text,
           'data-turbo-frame': 'attach_modal' do %>
           <%= t('avo.attach_item', item: @field.name.downcase) %>
         <% end %>

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

@@ -3,6 +3,7 @@
 class Avo::Fields::IndexComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
+  attr_reader :field
   attr_reader :parent_resource
   attr_reader :view
 

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

@@ -1,6 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if field.value_present? %>
-    <%= js_map [{latitude: field.value[0], longitude: field.value[1]}], id: "location-map" %>
+    <%= js_map [{latitude: field.value[0], longitude: field.value[1]}], id: "location-map", zoom: field.zoom, controls: true %>
   <% else %>
     —
   <% end %>

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

@@ -1,6 +1,7 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
   <div data-controller="easy-mde">
     <%= @form.text_area @field.id,
+      value: @field.value,
       class: classes("w-full js-has-easy-mde-editor"),
       data: {
         view: view,

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

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.number_field @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,

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

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.password_field @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,

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

@@ -6,6 +6,7 @@
       </div>
     <% end %>
     <%= @form.range_field @field.id,
+      value: @field.value,
       class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
       data: {
         action: "input->progress-bar-field#update",

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

@@ -5,6 +5,6 @@
     disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
-    value: @resource.record.present? ? @resource.record[@field.id] : @field.value
+    value: @field.value
   %>
 <% end %>

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

@@ -1,11 +1,11 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= form.text_field @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
-    # value: @field.value,
     multiple: multiple,
     autocomplete: @field.autocomplete
   %>

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

@@ -1,5 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.text_area @field.id,
+    value: @field.value,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,

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

@@ -20,9 +20,10 @@
       },
       input: trix_id,
       placeholder: @field.placeholder do %>
-      <%= sanitize @field.value %>
+      <%= sanitize @field.value.to_s %>
     <% end %>
     <%= @form.text_area @field.id,
+      value: @field.value,
       class: classes("w-full hidden"),
       data: @field.get_html(:data, view: view, element: :input),
       disabled: disabled?,

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

@@ -8,7 +8,7 @@
       <%= link_to t('avo.show_content'), 'javascript:void(0);', class: 'font-bold inline-block', data: { action: 'click->hidden-input#showContent' } %>
     <% end %>
     <div class="<%= content_classes %> " data-hidden-input-target="content">
-      <%= sanitize @field.value %>
+      <%= sanitize @field.value.to_s %>
     </div>
   </div>
 <% end %>

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

@@ -44,7 +44,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
       }
     end
 
-    helpers.resource_path(record: @resource.record, resource: parent_or_child_resource , **args)
+    helpers.resource_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
 
   def edit_path
@@ -73,7 +73,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     return @parent_resource if @parent_resource.present?
     return nil if @parent_record.blank?
 
-    ::Avo::App.resources.get_resource_by_model_class @parent_record.class
+    Avo.resource_manager.get_resource_by_model_class @parent_record.class
   end
 
   def is_has_many_association
@@ -81,11 +81,11 @@ 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.root_path(paths: ["resources", params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
   end
 
   def can_reorder?
-    return false unless Object.const_defined? "AvoPro::Ordering"
+    return false unless Object.const_defined? "Avo::Pro::Ordering"
 
     return authorize_association_for(:reorder) if @reflection.present?
 
@@ -167,13 +167,13 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
         target: "control:detach",
         control: :detach,
         "resource-id": @resource.record.id,
-        "tippy": "tooltip",
+        tippy: :tooltip,
       }
   end
 
   def render_order_controls(control)
     if can_reorder?
-      render AvoPro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
+      render Avo::Pro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
     end
   end
 

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

@@ -7,10 +7,7 @@
     <% c.with_body do %>
       <div class="divide-y">
         <% item.visible_items.each_with_index do |field, index| %>
-          <%= render field
-            .hydrate(resource: @resource, record: @resource.record, user: resource.user, view: view)
-            .component_for_view(view)
-            .new(field: field, resource: @resource, index: index, form: form) %>
+          <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
         <% end %>
       </div>
     <% end %>
@@ -19,4 +16,12 @@
   <%= render tab_group_component %>
 <% elsif item.is_field? %>
   <%= render field_component %>
+<% elsif item.is_row? %>
+  <%= render Avo::RowComponent.new do |c| %>
+    <% c.with_body do %>
+      <% item.visible_items.each_with_index do |field, index| %>
+        <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
+      <% end %>
+    <% end %>
+  <% end %>
 <% end %>

data/app/components/avo/item_switcher_component.rb

@@ -42,6 +42,7 @@ class Avo::ItemSwitcherComponent < Avo::BaseComponent
   end
 
   def field_component
-    item.component_for_view(@view).new(field: item.hydrate(resource: @resource, view: @view, record: @resource.record), resource: @resource, index: index, form: form)
+    final_item = item.dup.hydrate(resource: @resource, record: @resource.record, user: resource.user, view: view)
+    final_item.component_for_view(@view).new(field: final_item, resource: @resource, index: index, form: form)
   end
 end

data/app/components/avo/resource_component.rb

@@ -102,7 +102,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def sidebar
-    return if Avo::App.license.lacks_with_trial(:resource_sidebar)
+    return if Avo.license.lacks_with_trial(:resource_sidebar)
 
     @sidebar ||= search_for_sidebar
   end
@@ -113,7 +113,8 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
-      fields = ::Avo::App.resources.get_resource_by_model_class(@reflection.active_record.name).get_field_definitions
+      resource = Avo.resource_manager.get_resource_by_model_class(@reflection.active_record.name).new(params: helpers.params, view: view, user: helpers.current_user)
+      fields = resource.get_field_definitions
       filtered_fields = fields.filter { |f| f.id == @reflection.name }
     else
       return false
@@ -287,7 +288,8 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def render_action(action)
-    return unless can_see_the_actions_button?
+    return if !can_see_the_actions_button?
+    return if !action.action.visible_in_view(parent_resource: @parent_resource)
 
     a_link action.path,
       color: action.color,

data/app/components/avo/resource_sidebar_component.rb

@@ -16,6 +16,6 @@ class Avo::ResourceSidebarComponent < ViewComponent::Base
   end
 
   def render?
-    Avo::App.license.has_with_trial(:resource_sidebar)
+    Avo.license.has_with_trial(:resource_sidebar)
   end
 end

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

@@ -0,0 +1,3 @@
+<div class="flex flex-col sm:flex-row min-h-14 grow shrink-0" data-component="<%= self.class %>">
+  <%= body %>
+</div>

data/app/components/avo/row_component.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Avo::RowComponent < ViewComponent::Base
+  attr_reader :classes
+
+  renders_one :body
+
+  def initialize(classes: nil, data: {})
+    @classes = classes
+    @data = data
+  end
+end

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

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

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

@@ -6,18 +6,20 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   attr_reader :label
   attr_reader :path
   attr_reader :data
+  attr_reader :icon
 
-  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {})
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {}, icon: nil)
     @label = label
     @path = path
     @active = active
     @target = target
     @data = data
+    @icon = icon
   end
 
   def is_external?
     # If the path contains the scheme, check if it includes the root path or not
-    return !path.include?(Avo::App.mount_path) if URI(path).scheme.present?
+    return !path.include?(Avo.mount_path) if URI(path).scheme.present?
 
     false
   end
@@ -28,6 +30,6 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   end
 
   def classes
-    "px-4 pr-0 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-100"
+    "px-4 pr-0 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-100 gap-1"
   end
 end

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

@@ -13,8 +13,8 @@
       <div class="space-y-6 mb-4">
         <%= render Avo::Sidebar::LinkComponent.new label: 'Get started', path: helpers.avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil? %>
 
-        <% if Avo.plugin_manager.installed?(:avo_menu) && Avo::App.has_main_menu? %>
-          <% Avo::App.main_menu.items.each do |item| %>
+        <% if Avo.plugin_manager.installed?("avo-menu") && Avo.has_main_menu? %>
+          <% Avo.main_menu.items.each do |item| %>
             <%= render Avo::Sidebar::ItemSwitcherComponent.new item: item %>
           <% end %>
         <% else %>
@@ -60,7 +60,7 @@
     <% if Rails.env.development? %>
       <div class="p-4 border-t group">
         <%= link_to helpers.avo.avo_private_status_path, class: "block px-4 py-2 border rounded flex justify-between items-center w-full text-black text-sm" do %>
-          <span>Avo Status</span> <span><div class="rounded-full w-4 h-4 <%= Avo::App.instance.app_status ? "bg-green-400" : "bg-orange-400" %>"></div></span>
+          <span>Avo Status</span> <span><div class="rounded-full w-4 h-4 <%= Avo.app_status ? "bg-green-400" : "bg-orange-400" %>"></div></span>
         <% end %>
         <div class="absolute text-xs text-gray-700 group-hover:block hidden text-center w-full -ml-4">👆Visible only in development👆</div>
       </div>

data/app/components/avo/sidebar_component.rb

@@ -7,17 +7,17 @@ class Avo::SidebarComponent < ViewComponent::Base
   end
 
   def dashboards
-    return [] unless defined?(AvoDashboards)
+    return [] unless defined?(Avo::Dashboards)
 
-    AvoDashboards.dashboard_manager.dashboards_for_navigation
+    Avo::Dashboards.dashboard_manager.dashboards_for_navigation
   end
 
   def resources
-    Avo::Current.app.resource_manager.resources_for_navigation helpers._current_user
+    Avo.resource_manager.resources_for_navigation helpers._current_user
   end
 
   def tools
-    Avo::App.tools.tools_for_navigation
+    Avo.tool_manager.tools_for_navigation
   end
 
   def stimulus_target

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

@@ -30,10 +30,10 @@
       data-transition-leave-start="transform opacity-100 translate-y-0"
       data-transition-leave-end="transform opacity-0 translate-y-1"
     >
-      <% if Avo.plugin_manager.installed?(:avo_menu) && Avo::App.has_profile_menu? %>
+      <% if Avo.plugin_manager.installed?("avo-menu") && Avo.has_profile_menu? %>
         <div class="text-black space-y-4">
-          <% Avo::App.profile_menu.items.each do |item| %>
-            <% if item.is_a? AvoMenu::Link %>
+          <% Avo.profile_menu.items.each do |item| %>
+            <% if item.is_a? Avo::Menu::Link %>
               <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon %>
             <% end %>
           <% end %>

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

@@ -79,6 +79,6 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
 
   # Render :show view for read only trix fields
   def view_for(field)
-    (field.is_a? Avo::Fields::TrixField) && field.is_disabled? ? :show : view
+    field.is_a?(Avo::Fields::TrixField) && field.is_disabled? ? :show : view
   end
 end

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

@@ -34,7 +34,7 @@
             </div>
           </div>
           <% if Avo.avo_filters_installed? && resource.has_filters? %>
-            <%= render AvoFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
+            <%= render Avo::DynamicFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
           <% end %>
         </div>
       </div>