avo 2.46.0 → 3.0.0.pre2

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
 class Avo::Fields::FilesField::EditComponent < Avo::Fields::EditComponent
-  include Avo::Fields::Concerns::FileAuthorization
 end

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

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
+  <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% end %>

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

@@ -1,3 +1,3 @@
 <turbo-frame id="<%= @field.turbo_frame %>" src="<%= @field.frame_url %>" target="_top" class="block">
-  <%= render(Avo::LoadingComponent.new(title: @field.plural_name)) %>
+  <%= render(Avo::LoadingComponent.new(title: @field.name)) %>
 </turbo-frame>

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

@@ -1,3 +1,3 @@
 <%= index_field_wrapper **field_wrapper_args do %>
-  <%= link_to @field.label, helpers.resource_path(model: @field.value, resource: @field.target_resource) %>
+  <%= link_to @field.label, helpers.resource_path(record: @field.value, resource: @field.target_resource) %>
 <% end %>

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

@@ -4,7 +4,7 @@
   </turbo-frame>
 <% else %>
   <%= render Avo::PanelComponent.new(name: @field.name) do |c| %>
-    <% c.with_tools do %>
+    <% c.tools do %>
       <% if !@field.is_readonly? && !@field.is_disabled? && can_attach? %>
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
@@ -25,7 +25,7 @@
       <% end %>
     <% end %>
 
-    <% c.with_body do %>
+    <% c.body do %>
       <div class="py-8 flex justify-center items-center">
         <%= empty_state by_association: params[:related_name].present? %>
       </div>

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

@@ -21,7 +21,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def attach_path
-    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.to_param, @field.id)
+    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.record.to_param, @field.id)
   end
 
   def can_see_the_create_button?
@@ -36,15 +36,11 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def create_path
-    association_id = @field.resource.model_class._reflections[@field.id.to_s].inverse_of.name
-
     args = {
-      via_relation: association_id,
+      via_relation: @resource.singular_model_key,
       via_relation_class: @resource.model_class.to_s,
-      via_resource_id: @resource.model.to_param,
-      via_association_type: :has_one
+      via_record_id: @resource.record.to_param
     }
-
     helpers.new_resource_path(resource: @field.target_resource, **args)
   end
 end

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

@@ -3,15 +3,14 @@
 class Avo::Fields::IndexComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
-  attr_reader :field
   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
     @reflection = reflection
@@ -20,14 +19,14 @@ class Avo::Fields::IndexComponent < Avo::BaseComponent
   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/markdown_field/edit_component.html.erb

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

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

@@ -1,6 +1,5 @@
 <%= 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?,
@@ -8,7 +7,6 @@
     min: @field.min,
     placeholder: @field.placeholder,
     step: @field.step,
-    style: @field.get_html(:style, view: view, element: :input),
-    autocomplete: @field.autocomplete
+    style: @field.get_html(:style, view: view, element: :input)
   %>
 <% end %>

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

@@ -1,11 +1,9 @@
 <%= 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?,
     placeholder: @field.placeholder,
-    style: @field.get_html(:style, view: view, element: :input),
-    autocomplete: @field.autocomplete
+    style: @field.get_html(:style, view: view, element: :input)
     %>
 <% end %>

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/progress_bar_field/edit_component.html.erb

@@ -6,7 +6,6 @@
       </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/select_field/edit_component.html.erb

@@ -9,8 +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,
-    placeholder: @field.include_blank.present? ? nil : @field.placeholder,
-    autocomplete: @field.autocomplete
+    value: @field.record.present? ? @field.record[@field.id] : @field.value,
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder
   %>
 <% end %>

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

@@ -8,14 +8,16 @@ 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
+    @short = short
     @view = :show
   end
 
@@ -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/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: @field.value
+    value: @resource.record.present? ? @resource.record[@field.id] : @field.value
   %>
 <% end %>

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

@@ -1,12 +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),
-    multiple: multiple,
-    autocomplete: @field.autocomplete
+    # value: @field.value,
+    multiple: multiple
   %>
 <% end %>

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

@@ -1,6 +1,5 @@
 <%= 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,10 +20,9 @@
       },
       input: trix_id,
       placeholder: @field.placeholder do %>
-      <%= sanitize @field.value.to_s %>
+      <%== @field.value %>
     <% 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/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

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

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.html.erb

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

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

@@ -1,6 +1,9 @@
 <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 %>
@@ -13,7 +16,7 @@
     <% 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? %>
+      <% 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 %>
@@ -40,7 +43,7 @@
       <% end %>
     </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>

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

@@ -3,14 +3,15 @@
 class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
-  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
   end
 
   private
@@ -30,13 +31,13 @@ class Avo::Index::GridItemComponent < Avo::BaseComponent
   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
 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>