avo 2.11.3.pre.3 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a3f78d32b04247f263b94f22dcfbc0e825e3ea99a311c1642866b30a46524f
-  data.tar.gz: 7344cfbc9197ac2537003045a2ab340165ba4964b095ef914e6ca49852881373
+  metadata.gz: cb6907b0e852005ad23b73029892ac673ef73f955afe6b317d61c0c9303d3ef3
+  data.tar.gz: 980fbca1412954ea0e5d1f75ae12e653cd10bfb58307a2fec1a8eafc08c51852
 SHA512:
-  metadata.gz: 25e7ee4600617e4786e3b0c43e6b1f03fa4e3e14ab861745d5c9915352cdeb2c66e4d1444ebf1e834c6cb82fea7d854f3440b274ca90a946630279370928cc69
-  data.tar.gz: 4363ffce5ed2b2172d0c992d98dd8c9bcc8c68e82e7e48dfec8040efe877f8b2aab9203e538110f1ac3a2f77fa2f2d90caa573fc24f7eddc6af6f619da791966
+  metadata.gz: c43462a617f2bb6131b899665687ab371823a2c983338f32d095e0b33dfd543a4e3488e94b03f8e6dec1b7ed6162c0fa86d1cbacfde7b1cf07ef6ed5120192e6
+  data.tar.gz: e06be5c7fd0c244f683d4bf9960892dac729dc155bbc90f0903758ba3beca5a0394feea932db9c8d67c3ef2836fcf03a1e0056efcb90f8fded28998969cb6e56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.3.pre.3)
+    avo (2.12.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -252,8 +252,6 @@ GEM
     nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.7-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport

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="card"
-  data-card-target="card"
+  data-controller="dashboard-card"
+  data-dashboard-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">
-        <div class="text-sm font-bold text-gray-700 leading-none">
-          <%= @card.label %>
-        </div>
-        <div class="flex" data-controller="select">
+      <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">
           <% 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-xs text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 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-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',
               data: {
                 target: 'select',
                 action: 'change->select#onChange'

data/app/components/avo/index/ordering/buttons_component.html.erb

@@ -9,7 +9,7 @@
   <% else %>
     <div class="popover inline-block"
       data-controller="popover"
-      data-popover-translate-x="-100%"
+      data-popover-translate-x="<%= Avo.configuration.resource_controls_placement == :left ? '20%' : '-100%' %>"
       data-popover-translate-y="-32px"
       data-action="mouseover->popover#mouseOver mouseout->popover#mouseOut"
       >

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

@@ -58,7 +58,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def singular_resource_name
     if @reflection.present?
-      reflection_resource.name
+      field&.name&.singularize || reflection_resource.name
     else
       @resource.singular_name.present? ? @resource.singular_name : @resource.model_class.model_name.name.downcase
     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-application 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-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/app/components/avo/views/resource_edit_component.rb

@@ -35,26 +35,6 @@ 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,126 +1,78 @@
 <%= content_tag :div,
-  class: 'space-y-6',
   data: {
     **@resource.stimulus_data_attributes
   } do %>
-  <%= 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,
+  <%= 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 %>
-          <% end %>
+          <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
         <% end %>
-        <% if can_see_the_actions_button? %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-        <% end %>
-        <% if can_see_the_create_button? %>
-          <%= a_link create_path,
+      <% end %>
+      <% if can_see_the_actions_button? %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+      <% end %>
+      <% if can_see_the_create_button? %>
+        <%= a_link create_path,
           icon: 'heroicons/outline/plus',
           'data-target': 'create',
           style: :primary,
           color: :primary do %>
-            <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
-          <% end %>
+          <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
         <% 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 %>"
+    <% 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 %>"
         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)) %>
-              </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 %>
+        <% 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 %>
-      <% 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, discreet_pagination: field&.discreet_pagination %>
+        <% 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>
-          <% end %>
+          </div>
+        <% else %>
+          <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
         <% 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">
+      <% 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, 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_index_component.rb

@@ -124,6 +124,8 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   def singular_resource_name
     if @reflection.present?
+      return name.singularize if field.present?
+      
       reflection_resource.name
     else
       @resource.singular_name || @resource.model_class.model_name.name.downcase

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

@@ -5,11 +5,6 @@
     selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <% if @resource.cards.present? %>
-    <%= content_tag :div, class: "mb-6" do %>
-      <%= render Avo::CardsListComponent.new parent: @resource %>
-    <% end %>
-  <% end %>
   <%= 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 @reflection.present? && @resource.model.present? %>

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
+      @resource = resource.hydrate(params: params)
     end
 
     def set_related_resource
@@ -126,7 +126,6 @@ module Avo
     end
 
     def set_model
-      puts ["controller_name->", controller_name].inspect
       @model = eager_load_files(@resource, @resource.class.find_scope).find params[:id]
     end
 
@@ -157,7 +156,7 @@ module Avo
     end
 
     def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model, params: params)
+      @resource.hydrate(view: action_name.to_sym, user: _current_user)
     end
 
     def hydrate_related_resource
@@ -208,6 +207,11 @@ module Avo
     end
 
     def related_resource
+      # Find the field from the parent resource
+      field = @resource.get_field params[:related_name]
+
+      return field.use_resource if field&.use_resource.present?
+
       reflection = @model._reflections[params[:related_name]]
 
       reflected_model = reflection.klass

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 :set_related_model, only: [:show, :order]
     before_action :hydrate_related_resource, only: [:show, :index, :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]
@@ -102,7 +102,7 @@ module Avo
     end
 
     def set_attachment_resource
-      @attachment_resource = App.get_resource_by_model_name @attachment_class
+      @attachment_resource = @field.use_resource || (App.get_resource_by_model_name @attachment_class)
     end
 
     def set_attachment_model

data/app/controllers/avo/base_controller.rb

@@ -7,7 +7,6 @@ module Avo
     before_action :hydrate_resource
     before_action :set_applied_filters, only: :index
     before_action :set_model, only: [:show, :edit, :destroy, :update, :order]
-    before_action :hydrate_resource
     before_action :set_model_to_fill
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
@@ -101,7 +100,7 @@ module Avo
 
     def new
       @model = @resource.model_class.new
-      @resource = @resource.hydrate(model: @model, view: :new)
+      @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
       set_actions
 
@@ -171,7 +170,7 @@ module Avo
     def update
       # model gets instantiated and filled in the fill_model method
       saved = save_model
-      @resource = @resource.hydrate(model: @model, view: :edit)
+      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       respond_to do |format|
         if saved
@@ -210,9 +209,6 @@ module Avo
       end
     end
 
-    def cards
-    end
-
     private
 
     def save_model
@@ -380,7 +376,7 @@ module Avo
     end
 
     def set_edit_title_and_breadcrumbs
-      @resource = @resource.hydrate(model: @model, view: :edit)
+      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
       @page_title = @resource.default_panel_name.to_s
 
       last_crumb_args = {}

data/app/controllers/avo/cards_controller.rb

@@ -2,12 +2,7 @@ require_dependency "avo/application_controller"
 
 module Avo
   class CardsController < ApplicationController
-    before_action :set_dashboard
-    before_action :set_resource_name
-    before_action :set_resource, if: -> { @dashboard.blank? }
-    before_action :set_model, only: :show, if: -> { @resource.present? }
-    before_action :hydrate_resource, if: -> { @resource.present? }
-    before_action :set_parent, only: :show
+    before_action :set_dashboard, only: :show
     before_action :set_card, only: :show
 
     def show
@@ -15,23 +10,15 @@ module Avo
 
     private
 
-    def set_parent
-      @parent = @dashboard || @resource
-    end
-
     def set_dashboard
-      return if params[:dashboard_id].blank?
-
-      @dashboard_class = Avo::App.get_dashboard_by_id params[:dashboard_id]
-
-      raise ActionController::RoutingError.new("Not Found") if @dashboard_class.nil? || @dashboard_class.is_hidden?
+      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
 
-      @dashboard = @dashboard_class.new
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
     end
 
     def set_card
-      @card = @parent.item_at_index(params[:index].to_i).tap do |card|
-        card.hydrate(parent: @parent, params: params)
+      @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
+        card.hydrate(dashboard: @dashboard, params: params)
       end
     end
   end

data/app/controllers/avo/dashboards_controller.rb

@@ -10,11 +10,9 @@ module Avo
     private
 
     def set_dashboard
-      @dashboard_class = Avo::App.get_dashboard_by_id params[:id]
+      @dashboard = Avo::App.get_dashboard_by_id params[:id]
 
-      raise ActionController::RoutingError.new("Not Found") if @dashboard_class.nil? || @dashboard_class.is_hidden?
-
-      @dashboard = @dashboard_class.new.hydrate(params: params) if @dashboard_class.present?
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
     end
   end
 end

data/app/javascript/js/controllers.js

@@ -5,9 +5,9 @@ import ActionsPickerController from './controllers/actions_picker_controller'
 import AttachmentsController from './controllers/attachments_controller'
 import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
 import BooleanFilterController from './controllers/boolean_filter_controller'
-import CardController from './controllers/card_controller'
 import CodeFieldController from './controllers/fields/code_field_controller'
 import CopyToClipboardController from './controllers/copy_to_clipboard_controller'
+import DashboardCardController from './controllers/dashboard_card_controller'
 import DateFieldController from './controllers/fields/date_field_controller'
 import FilterController from './controllers/filter_controller'
 import HiddenInputController from './controllers/hidden_input_controller'
@@ -38,8 +38,8 @@ application.register('action', ActionController)
 application.register('actions-picker', ActionsPickerController)
 application.register('attachments', AttachmentsController)
 application.register('boolean-filter', BooleanFilterController)
-application.register('card', CardController)
 application.register('copy-to-clipboard', CopyToClipboardController)
+application.register('dashboard-card', DashboardCardController)
 application.register('filter', FilterController)
 application.register('hidden-input', HiddenInputController)
 application.register('item-select-all', ItemSelectAllController)

data/app/views/avo/cards/_metric_card.html.erb

@@ -1,5 +1,5 @@
-<div class="flex items-end text-gray-800">
+<div class="flex mt-4 items-end">
   <span class="text-3xl"><%= @card.prefix %></span>
-  <span class="text-5xl font-semibold"><%= @card.result_data %></span>
+  <span class="text-5xl"><%= @card.result_data %></span>
   <span class="text-3xl"><%= @card.suffix %></span>
 </div>

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

@@ -1,7 +1,24 @@
 <%= render Avo::PanelComponent.new(title: @dashboard.name, description: @dashboard.description) do |c| %>
   <% c.bare_content do %>
-    <% if @dashboard.cards.present? %>
-      <%= render Avo::CardsListComponent.new parent: @dashboard %>
+    <% if @dashboard.items.present? %>
+      <div class="min-h-24">
+        <%= content_tag(:div, class: "grid gap-4 grid-cols-1 #{@dashboard.classes}") do %>
+          <% @dashboard.items.each do |item| %>
+            <% if item.is_divider? %>
+              <%= render Avo::Dashboards::DividerComponent.new(divider: item) %>
+            <% elsif item.is_card? %>
+              <%= content_tag(:div, class: "relative bg-white rounded shadow-panel space-y-2 #{item.card_classes} overflow-hidden") do %>
+                <turbo-frame id="<%= item.turbo_frame %>"
+                  src="<%= item.frame_url(enforced_range: @range, params: params) %>"
+                  data-card-index="<%= item.index %>"
+                >
+                  <%= render(Avo::LoadingComponent.new(title: item.label)) %>
+                </turbo-frame>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
     <% else %>
       <div class="w-full h-full">
         <% if Rails.env.development? %>

data/app/views/layouts/avo/application.html.erb

@@ -18,7 +18,7 @@
       <% end %>
     <% end %>
   </head>
-  <body class="bg-application os-mac">
+  <body class="bg-gray-25 os-mac">
     <div class="relative flex flex-1 w-full min-h-full" data-controller="sidebar" data-sidebar-open-value="<%= @sidebar_open %>">
       <div class="flex-1 flex flex-col max-w-full">
         <%= render partial: "avo/partials/navbar" %>

data/config/routes.rb

@@ -35,9 +35,6 @@ Avo::Engine.routes.draw do
     # resources :posts
     Avo::DynamicRouter.routes(self)
 
-    # Cards
-    get "/:resource_name/:id/cards/:card_id", to: "cards#show"
-
     # Associations
     get "/:resource_name/:id/:related_name/new", to: "associations#new", as: "associations_new"
     get "/:resource_name/:id/:related_name/", to: "associations#index", as: "associations_index"