avo 3.0.0.pre11 → 3.0.0.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1674354633c9b8113bfdeba7a9e53ac54bd3f75af78c9492655c485c43a0ff
-  data.tar.gz: 53bd8bb7f50267e0b4756164fb85ffa1fe013a1c7642c4417dabd9d2320e4b57
+  metadata.gz: cbf17f6b86663450788938a16475eba907f1a85a400f72d0efd58b59baea131c
+  data.tar.gz: be6d1682124dfbc7a0fdbff863b80caab538b7fdf28768d463169f2acd2fd086
 SHA512:
-  metadata.gz: 857ed520648c9cbe1d2361c11bd6f48266c25c1c8fc0175b0843de23edbb7518eff352f8495c95bb6238a7d4e93e7a003fa1d86467d4999524baa6c1cb19042d
-  data.tar.gz: 32bf4c5d55be3aeae79411fd30df1a550eb8b417fd76680cee40925b4a1a9265c5a7b9d241182d638b333666fea00c95d811d9bc868a8f80b32aba3457f48e21
+  metadata.gz: 6c47148a510c188098e524e70c1f7782fdb6fdb0ad8592f6d1e7cdf44fb175c6973db23f4672e2361be971639a5943c44309ea69409967ebe427fc558d90367c
+  data.tar.gz: f065601a617923ac787e0d468276d379f2cfd8798f34c9bdd604ed3a8df7c0722ded2f1013a121b0d69c9d75c85ae0b38ed7a61c745509c83264ca1502f8c9b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.0.pre11)
+    avo (3.0.0.pre13)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/assets/stylesheets/avo.base.css

@@ -1,4 +1,4 @@
-@import './../../../node_modules/simplemde/dist/simplemde.min.css';
+@import './../../../node_modules/easymde/dist/easymde.min.css';
 @import './../../../node_modules/tippy.js/dist/tippy.css';
 @import './../../../node_modules/tippy.js/themes/light.css';
 @import './../../../node_modules/flatpickr/dist/flatpickr.css';

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

@@ -32,7 +32,7 @@
   >
     <div data-target="actions-list" class="w-full space divide-y">
       <% actions.each_with_index do |action, index| %>
-        <%= link_to action_path(action.param_id),
+        <%= link_to action_path(action),
           data: {
             action_name: action.action_name,
             'turbo-frame': 'actions_show',

data/app/components/avo/actions_component.rb

@@ -4,11 +4,12 @@ class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
   attr_reader :label, :size, :as_row_control
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :primary, label: nil, size: :md, as_row_control: false)
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], include: [], style: :outline, color: :primary, label: nil, size: :md, as_row_control: false)
     @actions = actions || []
     @resource = resource
     @view = view
     @exclude = exclude
+    @include = include
     @color = color
     @style = style
     @label = label || I18n.t("avo.actions")
@@ -21,19 +22,25 @@ class Avo::ActionsComponent < ViewComponent::Base
   end
 
   def actions
-    @actions.reject { |action| action.class.in?(@exclude) }
+    if @exclude.present?
+      @actions.reject { |action| action.class.in?(@exclude) }
+    elsif @include.present?
+      @actions.select { |action| action.class.in?(@include) }
+    else
+      @actions
+    end
   end
 
   # When running an action for one record we should do it on a special path.
   # We do that so we get the `record` param inside the action so we can prefill fields.
-  def action_path(id)
-    return single_record_path(id) if as_row_control
-    return many_records_path(id) unless @resource.has_record_id?
+  def action_path(action)
+    return single_record_path(action) if as_row_control
+    return many_records_path(action) unless @resource.has_record_id?
 
     if on_record_page?
-      single_record_path id
+      single_record_path action
     else
-      many_records_path id
+      many_records_path action
     end
   end
 
@@ -54,17 +61,34 @@ class Avo::ActionsComponent < ViewComponent::Base
     !on_record_page?
   end
 
-  def single_record_path(id)
-    Avo::Services::URIService.parse(@resource.record_path)
-      .append_paths("actions")
-      .append_query(action_id: id)
-      .to_s
+  def single_record_path(action)
+    action_url(action, @resource.record_path)
+  end
+
+  def many_records_path(action)
+    action_url(action, @resource.records_path)
   end
 
-  def many_records_path(id)
-    Avo::Services::URIService.parse(@resource.records_path)
+  def action_url(action, path)
+    Avo::Services::URIService.parse(path)
       .append_paths("actions")
-      .append_query(action_id: id)
-      .to_s
+      .append_query(
+        {
+          action_id: action.param_id,
+          arguments: encrypted_arguments(action)
+        }.compact
+      ).to_s
+  end
+
+  # Encrypt the arguments so we can pass them as a query param.
+  # EncryptionService can generate special characters that can break the URL.
+  # We use Base64 to encode the encrypted string so we can safely pass it as a query param and don't break the URL.
+  def encrypted_arguments(action)
+    return if action.arguments.blank?
+
+    Base64.encode64 Avo::Services::EncryptionService.encrypt(
+      message: action.arguments,
+      purpose: :action_arguments
+    )
   end
 end

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">
-          <%== message %>
+          <%= sanitize message %>
         </p>
       </div>
       <div class="ml-4 flex-shrink-0 flex items-center">

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

@@ -24,13 +24,13 @@
           <div class="text-red-600 mt-2 text-sm"><%= record.errors.full_messages_for(field.id).to_sentence %></div>
         <% end %>
         <% if help.present? %>
-          <div class="text-gray-600 mt-2 text-sm"><%== help %></div>
+          <div class="text-gray-600 mt-2 text-sm"><%= sanitize help %></div>
         <% end %>
       <% end %>
     </div>
   </div>
   <% if params[:avo_debug].present? %>
     <!-- Raw value: -->
-    <!-- <%== field.value.inspect %> -->
+    <!-- <%= sanitize field.value.inspect %> -->
   <% end %>
 <% end %>

data/app/components/avo/fields/common/heading_component.html.erb

@@ -3,7 +3,7 @@
     <% if empty %>
     <% elsif value.present? %>
       <% if as_html %>
-        <%== value %>
+        <%= sanitize value %>
       <% else %>
         <div class="font-semibold uppercase"><%= value %></div>
       <% end %>

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

@@ -1,10 +1,10 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <div data-controller="simple-mde">
+  <div data-controller="easy-mde">
     <%= @form.text_area @field.id,
-      class: classes("w-full js-has-simple-mde-editor"),
+      class: classes("w-full js-has-easy-mde-editor"),
       data: {
         view: view,
-        'simple-mde-target': 'element',
+        'easy-mde-target': 'element',
         'component-options': @field.options.to_json,
       },
       disabled: disabled?,

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

@@ -1,10 +1,10 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <div data-controller="simple-mde">
+  <div data-controller="easy-mde">
     <%= text_area_tag @field.id, @field.value,
-      class: helpers.input_classes('w-full js-has-simple-mde-editor'),
+      class: helpers.input_classes('w-full js-has-easy-mde-editor'),
       placeholder: @field.placeholder,
       disabled: disabled?,
-      'data-simple-mde-target': 'element',
+      'data-easy-mde-target': 'element',
       'data-component-options': @field.options.to_json,
       'data-view': :show %>
   </div>

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

@@ -20,7 +20,7 @@
       },
       input: trix_id,
       placeholder: @field.placeholder do %>
-      <%== @field.value %>
+      <%= sanitize @field.value %>
     <% end %>
     <%= @form.text_area @field.id,
       class: classes("w-full hidden"),

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">
-      <%== @field.value %>
+      <%= sanitize @field.value %>
     </div>
   </div>
 <% end %>

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

@@ -19,6 +19,6 @@
   <% end %>
   <% if params[:avo_debug].present? %>
     <!-- Raw value: -->
-    <!-- <%== @field.value.inspect %> -->
+    <!-- <%= sanitize @field.value.inspect %> -->
   <% end %>
 <% end %>

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

@@ -5,45 +5,19 @@
   data-resource-name="<%= @resource.class.to_s %>"
   data-record-id="<%= @resource.record.id %>"
 >
-  <%= content_tag :div, class: "relative w-full pb-3/4 rounded-t overflow-hidden #{cover.present? ? cover.get_html(:classes, view: :index, element: :wrapper) : ""}", style: cover.present? ? cover.get_html(:style, view: :index, element: :wrapper) : "" do %>
-    <% if @resource.record_selector %>
-      <%== item_selector_input floating: true, size: :lg %>
-    <% end %>
-    <% if cover.blank? %>
-      <%= link_to resource_view_path do %>
-        <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
-      <% end %>
-    <% elsif cover.respond_to?(:to_image) && cover.to_image.present? %>
-      <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
-    <% elsif cover.type == 'file' %>
-      <% if cover.value.attached? && cover.value.representable? %>
-        <%= link_to_if cover.link_to_resource, image_tag(helpers.main_app.url_for(cover.value.variant(resize_to_limit: [480, 480])), class: 'absolute h-full w-full object-cover'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
-      <% else %>
-        <%= link_to resource_view_path do %>
-          <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
-        <% end %>
-      <% end %>
-    <% elsif cover.value.present? %>
-      <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
-    <% else %>
-      <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
-    <% end %>
+  <%= content_tag :div,
+    class: "relative w-full pb-3/4 rounded-t overflow-hidden #{html(:cover, :classes)}",
+    style: html(:cover, :style) do %>
+    <%== item_selector_input(floating: true, size: :lg) if @resource.record_selector%>
+    <%= render_cover %>
   <% end %>
-  <%= content_tag :div, class: "grid grid-cols-1 place-content-between p-4 h-full" do %>
+  <div class="grid grid-cols-1 place-content-between p-4 h-full">
     <div class="mb-4 h-full flex flex-col space-between">
-      <% if title.present? %>
-        <%= content_tag :div, class: "grid font-semibold leading-tight text-lg mb-2 #{title.get_html(:classes, view: :index, element: :wrapper)}", style: title.get_html(:style, view: :index, element: :wrapper) do %>
-          <%= link_to_if title.link_to_resource, title.value, resource_view_path %>
-        <% end %>
-      <% end %>
-      <% if body.present? %>
-        <%= content_tag :div, class: "text-sm break-words text-gray-500 #{body.get_html(:classes, view: :index, element: :wrapper)}", style: body.get_html(:style, view: :index, element: :wrapper) do %>
-          <%= body.value %>
-        <% end %>
-      <% end %>
+      <%= render_title %>
+      <%= render_body %>
     </div>
     <div class="w-full place-self-end">
       <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, view_type: :grid, actions: actions)) %>
     </div>
-  <% end %>
+  </div>
 </div>

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

@@ -2,30 +2,26 @@
 
 class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
+  include Avo::Fields::Concerns::HasHTMLAttributes
 
   attr_reader :parent_resource, :actions
 
   def initialize(resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, actions: nil)
     @resource = resource
     @reflection = reflection
-    @grid_fields = resource.get_grid_fields
     @parent_record = parent_record
     @parent_resource = parent_resource
     @actions = actions
+    @card = Avo::ExecutionContext.new(target: resource.grid_view[:card], resource: resource, record: resource.record).handle
+    @whole_html = Avo::ExecutionContext.new(target: resource.grid_view[:html], resource: resource, record: resource.record).handle
   end
 
   private
 
-  def cover
-    @grid_fields.cover_field
-  end
-
-  def title
-    @grid_fields.title_field
-  end
+  def html(element, type)
+    return "" if @whole_html.nil? || (@html = @whole_html[element]).nil?
 
-  def body
-    @grid_fields.body_field
+    get_html(type, view: :index, element: :wrapper)
   end
 
   def resource_view_path
@@ -40,4 +36,34 @@ class Avo::Index::GridItemComponent < Avo::BaseComponent
 
     helpers.resource_view_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
+
+  def render_cover
+    return link_to_cover if @card[:cover_url].present?
+
+    link_to resource_view_path do
+      render Avo::Index::GridCoverEmptyStateComponent.new
+    end
+  end
+
+  def link_to_cover
+    classes = "absolute h-full w-full object-cover"
+
+    link_to image_tag(@card[:cover_url], class: classes), resource_view_path, class: classes, title: @card[:title]
+  end
+
+  def render_title
+    return if @card[:title].blank?
+
+    content_tag :div, class: "grid font-semibold leading-tight text-lg mb-2 #{html(:title, :classes)}", style: html(:title, :style) do
+      link_to @card[:title], resource_view_path
+    end
+  end
+
+  def render_body
+    return if @card[:body].blank?
+
+    content_tag :div, class: "text-sm break-words text-gray-500 #{html(:body, :classes)}", style: html(:body, :style) do
+      @card[:body]
+    end
+  end
 end

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

@@ -25,7 +25,7 @@
   <% end %>
   <% if body? %>
     <div data-target="panel-body" class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:gap-4 w-full">
-      <div class="relative flex-1 <% if sidebar? %> w-2/3 <% else %> w-full <% end %>">
+      <div class="relative flex-1 w-full <% if sidebar? %> sm:w-2/3 <% end %>">
         <% # The body is wrapped inside another div in order to avoid long & tall panels next to sidebars when the sidebar taller. %>
         <div class="relative <%= white_panel_classes %> <%= @body_classes %>">
           <%= body %>

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

@@ -1,3 +1,18 @@
-<%= link_to path, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full", target: target, title: title do %>
-  <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
+<% if method.present? %>
+  <%= button_to path,
+    form_class: "flex-1 flex",
+    class: button_classes,
+    target: target,
+    title: title,
+    method: method,
+    params: params do %>
+    <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
+  <% end %>
+<% else %>
+  <%= link_to path,
+    class: button_classes,
+    target: target,
+    title: title do %>
+    <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
+  <% end %>
 <% end %>

data/app/components/avo/profile_item_component.rb

@@ -6,17 +6,29 @@ class Avo::ProfileItemComponent < ViewComponent::Base
   attr_reader :path
   attr_reader :active
   attr_reader :target
+  attr_reader :method
+  attr_reader :params
+  attr_reader :classes
 
-  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil)
+  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil, method: nil, params: {}, classes: "")
     @label = label
     @icon = icon
     @path = path
     @active = active
     @target = target
     @title = title
+    @method = method
+    @params = params
+    @classes = classes
   end
 
   def title
     @title || @label
   end
+
+  private
+
+  def button_classes
+    "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full"
+  end
 end

data/app/components/avo/resource_component.rb

@@ -165,6 +165,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
       resource: @resource,
       view: @view,
       exclude: actions_list.exclude,
+      include: actions_list.include,
       style: actions_list.style,
       color: actions_list.color,
       label: actions_list.label,

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

@@ -16,32 +16,32 @@
       <% end %>
     </div>
   </div>
-  <% if can_destroy_user? %>
-    <div class="relative" data-controller="toggle">
-      <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle#togglePanel">
-        <%= helpers.svg 'three-dots', class: 'h-4' %>
-      </a>
-      <div
-        class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full z-40"
-        data-toggle-target="panel"
-        data-transition-enter="transition ease-out duration-100"
-        data-transition-enter-start="transform opacity-0 translate-y-1"
-        data-transition-enter-end="transform opacity-100 translate-y-0"
-        data-transition-leave="transition ease-in duration-75"
-        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? %>
-          <div class="text-black space-y-4">
-            <% Avo::App.profile_menu.items.each do |item| %>
-              <% if item.is_a? AvoMenu::Link %>
-                <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon %>
-              <% end %>
+  <div class="relative" data-controller="toggle">
+    <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle#togglePanel">
+      <%= helpers.svg 'three-dots', class: 'h-4' %>
+    </a>
+    <div
+      class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full z-40"
+      data-toggle-target="panel"
+      data-transition-enter="transition ease-out duration-100"
+      data-transition-enter-start="transform opacity-0 translate-y-1"
+      data-transition-enter-end="transform opacity-100 translate-y-0"
+      data-transition-leave="transition ease-in duration-75"
+      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? %>
+        <div class="text-black space-y-4">
+          <% Avo::App.profile_menu.items.each do |item| %>
+            <% if item.is_a? AvoMenu::Link %>
+              <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon %>
             <% end %>
-          </div>
-        <% end %>
-        <%# Example link below %>
-        <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
+          <% end %>
+        </div>
+      <% end %>
+      <%# Example link below %>
+      <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
+      <% if can_destroy_user? %>
         <%= button_to helpers.main_app.send(destroy_user_session_path),
           form: { "data-turbo" => "false" },
           method: :delete,
@@ -52,7 +52,7 @@
           form_class: 'flex-1' do %>
           <%= helpers.svg 'logout', class: 'h-4 mr-1' %> <%= t('avo.sign_out') %>
         <% end %>
-      </div>
+    <% end %>
     </div>
-  <% end %>
+  </div>
 </div>

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

@@ -18,7 +18,7 @@
     multipart: true do |form| %>
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
     <%= content_tag :div, class: 'space-y-12' do %>
-      <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+      <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
         <% c.with_tools do %>
           <% @resource.render_edit_controls.each do |control| %>
             <%= render_control control %>

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

@@ -121,7 +121,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
       return
     end
 
-    @resource.resource_description
+    @resource.description
   end
 
   def show_search_input

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

@@ -7,7 +7,7 @@
     selected_resources: [@resource.record.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+  <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
     <% c.with_tools do %>
       <% @resource.render_show_controls.each do |control| %>
         <%= render_control control %>

data/app/controllers/avo/actions_controller.rb

@@ -56,7 +56,7 @@ module Avo
         resource: @resource,
         user: _current_user,
         view: @view,
-        arguments: @resource.get_action_arguments(action_class)
+        arguments: decrypted_arguments || {}
       )
     end
 
@@ -82,13 +82,7 @@ module Avo
           flash_messages messages
 
           if response[:type] == :redirect
-            path = response[:path]
-
-            if path.respond_to? :call
-              path = instance_eval(&path)
-            end
-
-            redirect_to path
+            redirect_to Avo::ExecutionContext.new(target: response[:path]).handle
           elsif response[:type] == :reload
             redirect_back fallback_location: resources_path(resource: @resource)
           end
@@ -119,6 +113,16 @@ module Avo
       )
     end
 
+    def decrypted_arguments
+      arguments = params[:arguments] || params.dig(:fields, :arguments)
+      return if arguments.blank?
+
+      Avo::Services::EncryptionService.decrypt(
+        message: Base64.decode64(arguments),
+        purpose: :action_arguments
+      )
+    end
+
     def flash_messages(messages)
       messages.each do |message|
         flash[message[:type]] = message[:body]

data/app/controllers/avo/associations_controller.rb

@@ -54,7 +54,7 @@ module Avo
         end
 
         @options = query.all.map do |record|
-          [record.send(@attachment_resource.class.title), record.id]
+          [@attachment_resource.hydrate(record: record).record_title, record.id]
         end
       end
     end

data/app/controllers/avo/base_controller.rb

@@ -47,7 +47,7 @@ module Avo
         field_id = @index_params[:sort_by].to_sym
         field = @resource.get_field_definitions.find { |field| field.id == field_id }
         @query = if field&.sortable.is_a?(Proc)
-          field.sortable.call(@query, @index_params[:sort_direction])
+          Avo::ExecutionContext.new(target: field.sortable, query: @query, direction: @index_params[:sort_direction]).handle
         else
           @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
         end
@@ -313,8 +313,20 @@ module Avo
       @index_params[:sort_direction] = params[:sort_direction] || :desc
 
       # View types
-      @index_params[:view_type] = params[:view_type] || @resource.default_view_type || Avo.configuration.default_view_type
-      @index_params[:available_view_types] = @resource.available_view_types
+      available_view_types = @resource.available_view_types
+      @index_params[:available_view_types] = available_view_types
+
+      @index_params[:view_type] = if params[:view_type].present?
+        params[:view_type]
+      elsif available_view_types.size == 1
+        available_view_types.first
+      else
+        @resource.default_view_type || Avo.configuration.default_view_type
+      end
+
+      if available_view_types.exclude? @index_params[:view_type].to_sym
+        raise "View type '#{@index_params[:view_type]}' is unavailable for #{@resource.class}."
+      end
     end
 
     def set_filters

data/app/controllers/avo/home_controller.rb

@@ -14,7 +14,7 @@ module Avo
         redirect_to computed_path
       elsif !Rails.env.development?
         @page_title = "Get started"
-        resource = Avo::App.resources.min_by { |resource| resource.model_key }
+        resource = Avo::Current.app.resource_manager.all.min_by { |resource| resource.model_key }
         redirect_to resources_path(resource: resource)
       end
     end