avo 2.44.0 → 3.0.2

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

@@ -7,27 +7,27 @@ class Avo::Fields::IndexComponent < Avo::BaseComponent
   attr_reader :parent_resource
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, reflection: nil, index: 0, parent_model: nil, parent_resource: nil)
+  def initialize(field: nil, resource: nil, reflection: nil, index: 0, parent_record: nil, parent_resource: nil)
     @field = field
     @resource = resource
     @index = index
-    @parent_model = parent_model
+    @parent_record = parent_record
     @parent_resource = parent_resource
-    @view = :index
+    @view = Avo::ViewInquirer.new("index")
     @reflection = reflection
   end
 
   def resource_view_path
     args = {}
 
-    if @parent_model.present?
+    if @parent_record.present?
       args = {
         via_resource_class: @parent_resource.class,
-        via_resource_id: @parent_model.to_param
+        via_record_id: @parent_record.to_param
       }
     end
 
-    helpers.resource_view_path(model: @resource.model, resource: parent_or_child_resource, **args)
+    helpers.resource_view_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
 
   def field_wrapper_args

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

@@ -1,16 +1,18 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if field.value_as_array? %>
     <div class="flex gap-4">
-      <%= @form.text_field @field.as_lat_long_field_id(:lat),
-        value: @field.as_lat_long_value(:lat),
-        class: classes("w-full"),
-        placeholder: @field.as_lat_long_placeholder(:lat)
-      %>
-      <%= @form.text_field @field.as_lat_long_field_id(:long),
-        value: @field.as_lat_long_value(:long),
-        class: classes("w-full"),
-        placeholder: @field.as_lat_long_placeholder(:long)
-      %>
+      <%= @form.fields_for @field.id do |coordinates_form| %>
+        <%= coordinates_form.text_field @field.as_lat_long_field_id(:lat),
+          value: @field.as_lat_long_value(:lat),
+          class: classes("w-full"),
+          placeholder: @field.as_lat_long_placeholder(:lat)
+        %>
+        <%= coordinates_form.text_field @field.as_lat_long_field_id(:long),
+          value: @field.as_lat_long_value(:long),
+          class: classes("w-full"),
+          placeholder: @field.as_lat_long_placeholder(:long)
+        %>
+    <% end %>
     </div>
   <% else %>
     <%= @form.text_field @field.id,

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

@@ -0,0 +1,10 @@
+<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, class: 'whitespace-no-wrap w-[1%]', flush: true, center_content: true do %>
+  <%= link_to resource_view_path,
+    title: t('avo.view_item', item: @resource.name).humanize,
+    data: {
+      controller: "preview",
+      preview_url_value: helpers.preview_resource_path(record: @record, resource: @resource, resource_id: @resource.record_id, turbo_frame: :preview_modal),
+    } do %>
+    <%= helpers.svg("magnifying-glass-circle", class: "block h-6 text-gray-600") %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::PreviewField::IndexComponent < Avo::Fields::IndexComponent
+end

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

@@ -9,7 +9,7 @@
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     style: @field.get_html(:style, view: view, element: :input),
-    value: @field.model.present? ? @field.model[@field.id] : @field.value,
+    value: @field.record.present? ? @field.record[@field.id] : @field.value,
     placeholder: @field.include_blank.present? ? nil : @field.placeholder,
     autocomplete: @field.autocomplete
   %>

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

@@ -8,15 +8,17 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
   attr_reader :index
   attr_reader :resource
   attr_reader :stacked
+  attr_reader :short
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false, stacked: nil)
+  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false, short: false, stacked: nil)
     @compact = compact
     @field = field
     @index = index
     @resource = resource
     @stacked = stacked
-    @view = :show
+    @short = short
+    @view = Avo::ViewInquirer.new("show")
   end
 
   def wrapper_data
@@ -48,6 +50,7 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
       field: field,
       index: index,
       resource: resource,
+      short: short,
       stacked: stacked,
       view: view
     }

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

@@ -4,6 +4,6 @@
   <% elsif @field.protocol.present? %>
     <%= link_to @field.value, "#{@field.protocol}:#{@field.value}" %>
   <% else %>
-    <%= link_to_if @field.link_to_resource, @field.value, resource_view_path %>
+    <%= link_to_if @field.link_to_record, @field.value, resource_view_path %>
   <% end %>
 <% end %>

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

@@ -1,6 +1,6 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= content_tag :div,
-    class: "relative block overflow-x-auto max-w-full",
+    class: "relative block overflow-x-auto max-w-4xl",
     data: {
       controller: "trix-field",
       trix_field_target: "controller",

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

@@ -16,7 +16,7 @@ class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
   end
 
   def resource_id
-    @resource_id || resource&.model&.id
+    @resource_id || resource&.record&.id
   end
 
   def trix_id

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

@@ -1,6 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%
-    content_classes = 'trix-content py-2'
+    content_classes = 'trix-content py-2 max-w-4xl'
     content_classes << ' hidden' unless @field.always_show
   %>
   <div data-controller="hidden-input">

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

@@ -1,4 +1,4 @@
-<div data-controller="toggle-panel">
+<div data-controller="toggle" data-component-name="<%= self.class.to_s.underscore %>">
   <div class="relative w-full flex justify-between">
     <%= a_button class: 'focus:outline-none',
       color: :primary,
@@ -6,7 +6,7 @@
       icon: 'filter',
       title: t('avo.click_to_reveal_filters'),
       'data-button': 'resource-filters',
-      'data-action': 'click->toggle-panel#togglePanel',
+      'data-action': 'click->toggle#togglePanel',
       'data-tippy': 'tooltip' do %>
       <%= t 'avo.filters' %>
       <% if @applied_filters.present? %>
@@ -15,7 +15,13 @@
     <% end %>
     <div
       class="absolute block inset-auto sm:right-0 top-full bg-white min-w-[300px] mt-2 z-40 shadow-modal rounded divide-y divide-gray-300 <%= 'hidden' unless params[:keep_filters_panel_open] == '1' %>"
-      data-toggle-panel-target="panel"
+      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"
     >
       <% @filters.each do |filter| %>
         <%= render partial: filter.class.template, locals: {filter: filter} %>

data/app/components/avo/filters_component.rb

@@ -3,11 +3,11 @@
 class Avo::FiltersComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(filters: [], resource: nil, applied_filters: [], parent_model: nil)
+  def initialize(filters: [], resource: nil, applied_filters: [], parent_record: nil)
     @filters = filters
     @resource = resource
     @applied_filters = applied_filters
-    @parent_model = parent_model
+    @parent_record = parent_record
   end
 
   def render?
@@ -16,8 +16,8 @@ class Avo::FiltersComponent < ViewComponent::Base
 
   def reset_path
     # If come from a association page
-    if @parent_model.present?
-      helpers.related_resources_path(@parent_model, @parent_model, filters: nil, reset_filter: true, keep_query_params: true)
+    if @parent_record.present?
+      helpers.related_resources_path(@parent_record, @parent_record, filters: nil, reset_filter: true, keep_query_params: true)
     else
       helpers.resources_path(resource: @resource, filters: nil, reset_filter: true, keep_query_params: true)
     end

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

@@ -11,7 +11,7 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
     @classes = args[:class].present? ? args[:class] : ""
     @args = args
     @flush = flush
-    @view = :index
+    @view = Avo::ViewInquirer.new("index")
   end
 
   def classes
@@ -21,7 +21,6 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
       result += " py-3"
     end
 
-    result += " #{text_align_classes}"
     result += " #{@field.get_html(:classes, view: view, element: :wrapper)}"
 
     result
@@ -45,15 +44,4 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
 
     attributes
   end
-
-  private
-
-  def text_align_classes
-    case @field.index_text_align.to_sym
-    when :right
-      "text-right"
-    when :center
-      "text-center"
-    end
-  end
 end

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

@@ -1,46 +1,23 @@
 <div
   class="relative bg-white rounded shadow-modal flex flex-col group"
+  data-component-name="<%= self.class.to_s.underscore %>"
   <%== item_selector_init @resource %>
+  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_model: @parent_model, parent_resource: @parent_resource, view_type: :grid)) %>
+      <%= 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,41 +2,68 @@
 
 class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
+  include Avo::Fields::Concerns::HasHTMLAttributes
 
-  attr_reader :parent_resource
+  attr_reader :parent_resource, :actions
 
-  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
+  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_model = parent_model
+    @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
     args = {}
 
-    if @parent_model.present?
+    if @parent_record.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.to_param
+        via_record_id: @parent_record.to_param
       }
     end
 
-    helpers.resource_view_path(model: @resource.model, resource: parent_or_child_resource, **args)
+    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/index/resource_controls_component.html.erb

@@ -1,83 +1,5 @@
-<div class="space-x-2 flex flex-row justify-around w-full">
-  <% button_classes = "text-gray-600 h-6 hover:text-gray-600" %>
-
-  <% if can_reorder? %>
-    <%= render Avo::Index::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type %>
-  <% end %>
-
-  <% if can_view? %>
-    <%= link_to helpers.svg('eye', class: button_classes),
-      show_path,
-      class: 'flex items-center',
-      title: t('avo.view_item', item: singular_resource_name).humanize,
-      data: {
-        target: 'control:view',
-        control: :show,
-        'tippy': 'tooltip',
-      }
-    %>
-  <% end %>
-
-  <% if can_edit? %>
-    <%= link_to helpers.svg('edit', class: button_classes),
-      edit_path,
-      class: 'flex items-center',
-      title: t('avo.edit_item', item: singular_resource_name).humanize,
-      data: {
-        target: 'control:edit',
-        control: :edit,
-        'resource-id': @resource.model.id,
-        'tippy': 'tooltip',
-      }
-      %>
-  <% end %>
-
-  <% if can_detach? %>
-    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id),
-      method: :delete,
-      local: true,
-      class: 'flex items-center',
-      html: {
-        'data-turbo-frame': params[:turbo_frame]
-      } do |form| %>
-      <%= form.button helpers.svg('detach', class: button_classes),
-        title: t('avo.detach_item', item: singular_resource_name).humanize,
-        type: :submit,
-        data: {
-          target: 'control:detach',
-          turbo_confirm: t('avo.are_you_sure_detach_item', item: singular_resource_name),
-          control: :detach,
-          'resource-id': @resource.model.id,
-          'tippy': 'tooltip',
-        }
-      %>
-      <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_detach_#{@resource.model.id}" if params[:turbo_frame] %>
-      <%= hidden_field_tag :referrer, referrer_path, id: "referrer_detach_#{@resource.model.id}" if params[:turbo_frame] %>
-    <% end %>
-  <% end %>
-
-  <% if can_delete? %>
-    <%= form_with url: helpers.resource_path(model: @resource.model, resource: @resource),
-      method: :delete,
-      class: 'flex items-center',
-      local: true,
-      html: {
-        'data-turbo-frame': params[:turbo_frame]
-      } do |form| %>
-      <%= form.button helpers.svg('trash', class: button_classes),
-        title: t('avo.delete_item',  item: singular_resource_name).humanize,
-        type: :submit,
-        data: {
-          target: 'control:destroy',
-          turbo_confirm: t('avo.are_you_sure',  item: singular_resource_name),
-          control: :destroy,
-          'resource-id': @resource.model.id,
-          'tippy': 'tooltip',
-        }
-      %>
-      <%= form.hidden_field :view_type, value: params[:view_type], id: "turbo_view_type_#{@resource.model.id}" if params[:view_type] %>
-      <%= form.hidden_field :turbo_frame, value: params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
-      <%= form.hidden_field :referrer, value: referrer_path, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
-    <% end %>
+<div class="space-x-2 flex flex-row justify-end w-full">
+  <% @resource.render_row_controls(item: singular_resource_name).each do |control| %>
+    <%= render_control control %>
   <% end %>
 </div>