avo 3.0.0.beta1 → 3.0.0.pre1

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

@@ -1,4 +1,4 @@
-@import './../../../node_modules/easymde/dist/easymde.min.css';
+@import './../../../node_modules/simplemde/dist/simplemde.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';
@@ -70,6 +70,7 @@ body {
   @apply opacity-0 translate-y-1;
 }
 
+
 .turbo-progress-bar {
   @apply bg-primary-400;
 }

data/app/assets/svgs/failed_to_load.svg

@@ -9,5 +9,6 @@
 <defs>
 <stop stop-color="#E3ECFA"/>
 <stop offset="1" stop-color="#DAE7FF"/>
+</linearGradient>
 </defs>
 </svg>

data/app/assets/svgs/grid-empty-state.svg

@@ -22,6 +22,7 @@
 <feColorMatrix type="matrix" values="0 0 0 0 0.788235 0 0 0 0 0.803922 0 0 0 0 0.85098 0 0 0 0.349 0"/>
 <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_577_1090"/>
 <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_577_1090" result="shape"/>
+</filter>
 <filter id="filter1_d_577_1090" x="38.6401" y="0" width="170.72" height="78.1333" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>

data/app/assets/svgs/table-empty-state.svg

@@ -51,5 +51,6 @@
 </filter>
 <stop stop-color="#E3ECFA"/>
 <stop offset="1" stop-color="#DAE7FF"/>
+</linearGradient>
 </defs>
 </svg>

data/app/assets/svgs/triangle-up.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="21" height="9" role="presentation"><g fill="none" fill-rule="evenodd"><path fill="#C9CBCF" fill-opacity="1" d="M1 9.092h19l-6.402-6.74c-1.717-1.806-4.485-1.8-6.196 0L1 9.093zM20.342 8l-6.02-6.336c-2.108-2.22-5.538-2.218-7.645 0L.658 8h19.684z"></path><path fill="currentcolor" d="M7.402 2.353c1.711-1.801 4.48-1.807 6.196 0L20 9.093H1l6.402-6.74z"></path></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="21" height="9" role="presentation"><g fill="none" fill-rule="evenodd"><path fill="#8898AA" fill-opacity="0.1" d="M1 9.092h19l-6.402-6.74c-1.717-1.806-4.485-1.8-6.196 0L1 9.093zM20.342 8l-6.02-6.336c-2.108-2.22-5.538-2.218-7.645 0L.658 8h19.684z"></path><path fill="currentcolor" d="M7.402 2.353c1.711-1.801 4.48-1.807 6.196 0L20 9.093H1l6.402-6.74z"></path></g></svg>

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),
+        <%= link_to action_path(action.param_id),
           data: {
             action_name: action.action_name,
             'turbo-frame': 'actions_show',

data/app/components/avo/actions_component.rb

@@ -4,15 +4,14 @@ class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
   attr_reader :label, :size, :as_row_control
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], include: [], style: :outline, color: :primary, label: nil, size: :md, as_row_control: false)
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], 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")
+    @label = label || t("avo.actions")
     @size = size
     @as_row_control = as_row_control
   end
@@ -22,25 +21,19 @@ class Avo::ActionsComponent < ViewComponent::Base
   end
 
   def actions
-    if @exclude.present?
-      @actions.reject { |action| action.class.in?(@exclude) }
-    elsif @include.present?
-      @actions.select { |action| action.class.in?(@include) }
-    else
-      @actions
-    end
+    @actions.reject { |action| action.class.in?(@exclude) }
   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(action)
-    return single_record_path(action) if as_row_control
-    return many_records_path(action) unless @resource.has_record_id?
+  def action_path(id)
+    return single_record_path(id) if as_row_control
+    return many_records_path(id) unless @resource.has_record_id?
 
     if on_record_page?
-      single_record_path action
+      single_record_path id
     else
-      many_records_path action
+      many_records_path id
     end
   end
 
@@ -61,34 +54,15 @@ class Avo::ActionsComponent < ViewComponent::Base
     !on_record_page?
   end
 
-  def single_record_path(action)
-    action_url(action, @resource.record_path)
-  end
-
-  def many_records_path(action)
-    action_url(action, @resource.records_path)
+  def single_record_path(id)
+    Avo::Services::URIService.parse(@resource.record_path)
+      .append_paths("actions", id)
+      .to_s
   end
 
-  def action_url(action, path)
-    Avo::Services::URIService.parse(path)
-      .append_paths("actions")
-      .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
-    )
+  def many_records_path(id)
+    Avo::Services::URIService.parse(@resource.records_path)
+      .append_paths("actions", id)
+      .to_s
   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">
-          <%= sanitize message.to_s %>
+          <%== message %>
         </p>
       </div>
       <div class="ml-4 flex-shrink-0 flex items-center">

data/app/components/avo/base_component.rb

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

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

@@ -2,7 +2,7 @@
   class: classes,
   style: style,
   data: data do %>
-  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 <% if short? %> md:h-10 <% else %> md:h-14 <% end %> <% end %> pt-4 flex self-start items-center flex-shrink-0 <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 uppercase font-semibold text-gray-500 text-sm" data-slot="label">
+  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 <% if short? %> md:h-10 <% else %> md:h-14 <% end %> <% end %> pt-4 flex self-start items-center <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 uppercase font-semibold text-gray-500 text-sm" data-slot="label">
     <% if form.present? %>
       <%= form.label field.id, label %>
     <% else %>
@@ -11,7 +11,7 @@
     <% if on_edit? && field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
   </div>
   <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% if stacked? %> pb-4 <% else %><% end %> px-6 <%= @field.get_html(:classes, view: view, element: :content) %>" data-slot="value">
-    <div class="self-center w-full <% unless full_width? || compact? || stacked? %> md:w-8/12 <% end %>">
+    <div class="self-center <% if full_width? || compact? || stacked? %> w-full <% else %> md:w-8/12 <% end %>">
       <% if on_show? %>
         <% if field.value.blank? and dash_if_blank %>
           —
@@ -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"><%= sanitize help %></div>
+          <div class="text-gray-600 mt-2 text-sm"><%== help %></div>
         <% end %>
       <% end %>
     </div>
   </div>
   <% if params[:avo_debug].present? %>
     <!-- Raw value: -->
-    <!-- <%= sanitize field.value.inspect %> -->
+    <!-- <%== field.value.inspect %> -->
   <% end %>
 <% end %>

data/app/components/avo/field_wrapper_component.rb

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

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

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

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
-  def initialize(...)
-    super(...)
+  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false, **args)
+    super field: field, resource: resource, index: index, form: form, compact: compact, **args
 
     @polymorphic_record = nil
   end
@@ -31,10 +31,6 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
     @resource.record["#{@field.foreign_key}_type"]
   end
 
-  def polymorphic_resource
-    Avo.resource_manager.get_resource_by_model_class(polymorphic_class)
-  end
-
   # Get the polymorphic id
   def polymorphic_id
     @resource.record["#{@field.foreign_key}_id"]
@@ -48,7 +44,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
     return @polymorphic_record if @polymorphic_record.present?
 
-    @polymorphic_record = polymorphic_resource.find_record polymorphic_id, query: polymorphic_class.safe_constantize, params: params
+    @polymorphic_record = @resource.find_record polymorphic_id, query: polymorphic_class.safe_constantize, params: params
 
     @polymorphic_record
   end
@@ -60,6 +56,6 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   private
 
   def visit_through_association?
-    @field.target_resource.to_s == params[:via_resource_class].to_s
+    @field.target_resource.class.to_s == params[:via_resource_class].to_s
   end
 end

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

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

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

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

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

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

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

@@ -0,0 +1,5 @@
+<div class="relative py-3 grid xs:grid-cols-2 sm:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-3 rounded-xl">
+  <% @field.value.attachments.each do |file| %>
+    <%= render Avo::Fields::Common::SingleFileViewerComponent.new field: @field, resource: @resource, file: file %>
+  <% end %>
+</div>

data/app/components/avo/fields/common/files_list_viewer_component.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::FilesListViewerComponent < ViewComponent::Base
+  def initialize(field:, resource:)
+    @field = field
+    @resource = resource
+  end
+end

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

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

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

@@ -0,0 +1,56 @@
+<div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-3">
+  <% if file.present? %>
+    <div class="flex flex-col justify-between h-full">
+      <% if file.representable? && is_image? %>
+        <div class="max-h-[42rem] h-full flex">
+          <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover' %>
+        </div>
+      <% elsif is_audio? %>
+        <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% elsif is_video? %>
+        <%= video_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% else %>
+        <div class="relative flex flex-col justify-evenly items-center px-2 rounded-lg border bg-white border-gray-500 min-h-24">
+          <div class="flex flex-col justify-center items-center w-full">
+            <%= helpers.svg 'document-text', class: 'h-10 text-gray-600 mb-2' %>
+          </div>
+        </div>
+      <% end %>
+      <span class="text-gray-500 mt-2 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
+    </div>
+    <div class="flex space-x-2">
+      <div class="flex">
+        <% if @resource.authorization.authorize_action(:download_attachments?, raise_exception: false) %>
+          <%= a_link Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true, disposition: :attachment),
+            icon: 'heroicons/outline/download',
+            color: :primary,
+            download: true,
+            class: 'text-center',
+            title: t('avo.download_file'),
+            data: { tippy: :tooltip },
+            compact: true,
+            size: :xs %>
+        <% end %>
+      </div>
+      <div>
+        <% if @resource.authorization.authorize_action(:delete_attachments?, raise_exception: false) %>
+          <%= a_link destroy_path,
+            icon: 'heroicons/outline/trash',
+            color: :red,
+            compact: true,
+            size: :xs,
+            class: 'text-center',
+            title: t('avo.delete_file', item: file.filename),
+            data: {
+              turbo_method: :delete,
+              turbo_frame: 'destroy_attachment_form',
+              turbo_confirm: t('avo.are_you_sure'),
+              tippy: :tooltip
+            } %>
+        <% end %>
+      </div>
+    </div>
+  <% else %>
+    –
+  <% end %>
+</div>

data/app/components/avo/fields/common/single_file_viewer_component.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
+  include Avo::ApplicationHelper
+
+  def initialize(file: nil, field:, resource:)
+    @file = file
+    @field = field
+    @resource = resource
+  end
+
+  def destroy_path
+    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
+  end
+
+  def id
+    @field.id
+  end
+
+  def file
+    @file || @field.value.attachment
+  rescue
+    nil
+  end
+
+  def is_image?
+    file.image? || @field.is_image
+  rescue
+    false
+  end
+
+  def is_audio?
+    file.audio? || @field.is_audio
+  rescue
+    false
+  end
+
+  def is_video?
+    file.video? || @field.is_video
+  rescue
+    false
+  end
+
+  def render?
+    record_persisted?
+  end
+
+   # If record is not persistent blob is automatically destroyed otherwise it can be "lost" on storage
+  def record_persisted?
+    return true if @resource.record.persisted?
+
+    ActiveStorage::Blob.destroy(file.blob_id) if file.blob_id.present?
+    false
+  end
+end

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

@@ -1,6 +1,5 @@
 <%= field_wrapper **field_wrapper_args do %>
   <%= @form.select @field.id, @field.select_options, {
-      value: @field.value,
       selected: @field.value,
       include_blank: @field.include_blank
     },
@@ -11,7 +10,6 @@
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     style: @field.get_html(:style, view: view, element: :input),
-    placeholder: @field.include_blank.present? ? nil : @field.placeholder,
-    autocomplete: @field.autocomplete
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder
   %>
 <% end %>

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

@@ -1,11 +1,11 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <div class="mb-2">
-      <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+      <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
     </div>
   <% end %>
 
-  <% if can_upload_file? %>
+  <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
     <%= @form.file_field @field.id,
       accept: @field.accept,
       data: @field.get_html(:data, view: view, element: :input),
@@ -14,7 +14,5 @@
       style: @field.get_html(:style, view: view, element: :input),
       class: "w-full"
     %>
-  <% else %>
-    —
   <% end %>
 <% end %>

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

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

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

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

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

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+  <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= 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? %>
 
-  <% if can_upload_file? %>
+  <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
     <div class="mt-2">
       <%= @form.file_field @field.id,
         accept: @field.accept,
@@ -13,7 +13,5 @@
         class: "w-full"
       %>
     </div>
-  <% else %>
-    —
   <% end %>
 <% end %>

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

@@ -4,14 +4,13 @@
   </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',
           color: :primary,
-          style: :text,
           'data-turbo-frame': 'attach_modal' do %>
-          <%= t('avo.attach_item', item: @field.name.humanize(capitalize: false)) %>
+          <%= t('avo.attach_item', item: @field.name.downcase) %>
         <% end %>
       <% end %>
       <% if !@field.is_readonly? && !@field.is_disabled? && can_see_the_create_button? %>
@@ -21,12 +20,12 @@
           'data-turbo-frame': '_top',
           style: :primary,
           color: :primary do %>
-          <%= t('avo.create_new_item', item: @field.name.humanize(capitalize: false) ) %>
+          <%= t('avo.create_new_item', item: @field.name.downcase ) %>
         <% end %>
       <% 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>