avo 0.5.0.beta7 → 0.5.0.beta12

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

@@ -1,4 +1,4 @@
-<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>">
+<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>

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

@@ -4,7 +4,7 @@ class Avo::Index::FieldWrapperComponent < ViewComponent::Base
   def initialize(field: nil, dash_if_blank: true, **args)
     @field = field
     @dash_if_blank = dash_if_blank
-    @classes = args[:class].present? ? args[:class] : ''
+    @classes = args[:class].present? ? args[:class] : ""
     @args = args
   end
 end

data/app/components/avo/index/fields/belongs_to_field_component.html.erb

@@ -1,7 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <% if @field.value.present? %>
-    <%= link_to @field.label, helpers.resource_path(@field.value) %>
-  <% else %>
-    –
-  <% end %>
+  <%= link_to @field.label, helpers.resource_path(@field.value) %>
 <% end %>

data/app/components/avo/index/fields/boolean_group_field_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, dash_if_blank: false do %>
   <%= render Avo::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/index/fields/gravatar_field_component.html.erb

@@ -5,7 +5,8 @@
     size: @field.size,
     rounded: @field.rounded,
     link_to_resource: @field.link_to_resource,
-    link: helpers.resource_path(@resource.model)
+    link: helpers.resource_path(@resource.model),
+    title: t('avo.view_item', { item: @resource.name}).humanize
   )
   %>
 <% end %>

data/app/components/avo/index/fields/has_one_field_component.html.erb

@@ -1,7 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <% if @field.value.present? %>
-    <%= link_to @field.label, helpers.resource_path(@field.value) %>
-  <% else %>
-    –
-  <% end %>
+  <%= link_to @field.label, helpers.resource_path(@field.value) %>
 <% end %>

data/app/components/avo/index/fields/id_field_component.html.erb

@@ -6,5 +6,5 @@
       path = helpers.resource_path(@resource.model)
     end
   %>
-  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, path %>
+  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, path, title: t('avo.view_item', { item: @resource.name}).humanize %>
 <% end %>

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

@@ -5,8 +5,8 @@
     <%== item_selector_input floating: true, size: :lg %>
 
     <% if cover.respond_to? :to_image %>
-        <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
-    <% elsif cover.type == 'file_field' %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), 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(cover.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>

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

@@ -11,15 +11,16 @@ class Avo::Index::GridItemComponent < ViewComponent::Base
   end
 
   private
-    def cover
-      @grid_fields[:cover].first
-    end
 
-    def title
-      @grid_fields[:title].first
-    end
+  def cover
+    @grid_fields.cover_field
+  end
+
+  def title
+    @grid_fields.title_field
+  end
 
-    def body
-      @grid_fields[:body].first
-    end
+  def body
+    @grid_fields.body_field
+  end
 end

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

@@ -23,7 +23,9 @@
   <% end %>
 
   <% if can_detach? %>
-    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {'data-turbo-frame': params[:turbo_frame]} do |form| %>
+    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {
+        'data-turbo-frame': params[:turbo_frame]
+      } do |form| %>
       <%= form.button helpers.svg('trash-sm', class: 'text-gray-400 h-6 hover:text-gray-600'),
         title: t('avo.detach_item', { item: @resource.model.model_name.name.downcase }).capitalize,
         type: :submit,
@@ -34,12 +36,16 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:via_resource_class] %>
+      <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%#= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:via_resource_class] %>
     <% end %>
   <% end %>
 
   <% if can_delete? %>
-    <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: {'data-turbo-frame': params[:turbo_frame]} do |form| %>
+    <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: {
+        'data-turbo-frame': params[:turbo_frame]
+      } do |form| %>
       <%= form.button helpers.svg('trash', class: 'text-gray-400 h-6 hover:text-gray-600'),
         title: t('avo.delete_item', { item: @resource.model.model_name.name.downcase }).capitalize,
         type: :submit,
@@ -50,7 +56,9 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= form.hidden_field :referrer, value: request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:via_resource_class] %>
+      <%= 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: request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
     <% end %>
   <% end %>
 </div>

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

@@ -9,8 +9,8 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def can_detach?
     @reflection.present? &&
-    @resource.model.present? &&
-    (@reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection))
+      @resource.model.present? &&
+      (@reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection))
   end
 
   def can_edit?

data/app/components/avo/panel_component.rb

@@ -10,11 +10,12 @@ class Avo::PanelComponent < ViewComponent::Base
   end
 
   private
-    def data_attributes
-      return if @data.blank?
 
-      @data.map do |key, value|
-        " data-#{key}=\"#{value}\""
-      end.join
-    end
+  def data_attributes
+    return if @data.blank?
+
+    @data.map do |key, value|
+      " data-#{key}=\"#{value}\""
+    end.join
+  end
 end

data/app/components/avo/resource_component.rb

@@ -8,7 +8,8 @@ class Avo::ResourceComponent < ViewComponent::Base
   end
 
   private
-    def simple_relation?
-      @reflection.is_a? ::ActiveRecord::Reflection::HasManyReflection
-    end
+
+  def simple_relation?
+    @reflection.is_a? ::ActiveRecord::Reflection::HasManyReflection
+  end
 end

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

@@ -1,4 +1,4 @@
-<div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>">
+<div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <div class="h-16 flex self-start items-center text-blue-gray-800">
     <div class="w-48 md:w-64 px-8" data-slot="label">
       <%= @field.name %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>

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

@@ -4,12 +4,12 @@ class Avo::Show::FieldWrapperComponent < ViewComponent::Base
   def initialize(field: nil, dash_if_blank: true, full_width: false, **args)
     @field = field
     @dash_if_blank = dash_if_blank
-    @classes = args[:class].present? ? args[:class] : ''
+    @classes = args[:class].present? ? args[:class] : ""
     @args = args
     @full_width = full_width
 
-    if @index != 0 or @displayed_in_modal
-      @classes += ' border-t'
+    if (@index != 0) || @displayed_in_modal
+      @classes += " border-t"
     end
   end
 end

data/app/components/avo/show/fields/boolean_group_field_component.html.erb

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, index: @index do %>
+<%= show_field_wrapper field: @field, index: @index, dash_if_blank: false do %>
   <%= render Avo::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/show/fields/external_image_field_component.html.erb

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, field: @field do %>
+<%= show_field_wrapper field: @field do %>
   <% if @field.value.present? %>
     <%= image_tag @field.value, style: 'max-width: 340px;' %>
   <% end %>

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

@@ -17,7 +17,8 @@ class Avo::Views::ResourceEditComponent < ViewComponent::Base
   end
 
   private
-    def via_resource?
-      params[:via_resource_class].present? and params[:via_resource_id].present?
-    end
+
+  def via_resource?
+    params[:via_resource_class].present? && params[:via_resource_id].present?
+  end
 end

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

@@ -13,7 +13,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     filters: [],
     actions: [],
     reflection: nil,
-    turbo_frame: '',
+    turbo_frame: "",
     parent_model: nil
   )
     @resource = resource
@@ -63,7 +63,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     if @reflection.present?
       path_args = {
         via_relation_class: @parent_model.model_name,
-        via_resource_id: @parent_model.id,
+        via_resource_id: @parent_model.id
       }
 
       if @reflection.inverse_of.present?
@@ -77,7 +77,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def attach_path
-    "#{Avo.configuration.root_path}#{request.env['PATH_INFO']}/new"
+    "#{Avo.configuration.root_path}#{request.env["PATH_INFO"]}/new"
   end
 
   def detach_path
@@ -85,9 +85,10 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   private
-    def simple_relation?
-      return @reflection.is_a? ::ActiveRecord::Reflection::HasManyReflection if @reflection.present?
 
-      true
-    end
+  def simple_relation?
+    return @reflection.is_a? ::ActiveRecord::Reflection::HasManyReflection if @reflection.present?
+
+    true
+  end
 end

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

@@ -21,7 +21,8 @@ class Avo::Views::ResourceNewComponent < ViewComponent::Base
   end
 
   private
-    def via_resource?
-      params[:via_relation_class].present? and params[:via_resource_id].present?
-    end
+
+  def via_resource?
+    params[:via_relation_class].present? && params[:via_resource_id].present?
+  end
 end

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

@@ -18,8 +18,20 @@
             <% end %>
 
             <% if @resource.authorization.authorize_action(:destroy, raise_exception: false) %>
-              <%= a_link destroy_path, color: 'red', variant: 'outlined', method: :delete, data: {confirm: 'Are you sure?'} do %>
-                <%= svg 'trash' %> <%= t('avo.delete').capitalize %>
+              <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: { 'data-turbo-frame': params[:turbo_frame] } do |form| %>
+                <%= a_button title: t('avo.delete_item', { item: @resource.model.model_name.name.downcase }).capitalize,
+                  color: 'red',
+                  variant: 'outlined',
+                  type: :submit,
+                  data: {
+                    confirm: t('avo.are_you_sure', { item: @resource.model.model_name.name.downcase }),
+                    control: :destroy,
+                    'resource-id': @resource.model.id,
+                    'tippy': 'tooltip',
+                  } do
+                %>
+                  <%= svg 'trash' %> <%= t('avo.delete').capitalize %>
+                <% end %>
               <% end %>
             <% end %>
 

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

@@ -38,29 +38,29 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   end
 
   private
-    def via_resource?
-      params[:via_resource_class].present? and params[:via_resource_id].present?
-    end
 
-    def split_panel_fields
-      @fields_by_panel = {}
-      @has_one_panels = []
-      @has_many_panels = []
-      @has_as_belongs_to_many_panels = []
+  def via_resource?
+    params[:via_resource_class].present? && params[:via_resource_id].present?
+  end
 
-      @resource.get_fields.each do |field|
-        case field.class.to_s
-        when 'Avo::Fields::HasOneField'
-          @has_one_panels << field
-        when 'Avo::Fields::HasManyField'
-          @has_many_panels << field
-        when 'Avo::Fields::HasAndBelongsToManyField'
-          @has_as_belongs_to_many_panels << field
-        else
-          @fields_by_panel[field.panel_name] ||= []
-          @fields_by_panel[field.panel_name] << field
-        end
-      end
+  def split_panel_fields
+    @fields_by_panel = {}
+    @has_one_panels = []
+    @has_many_panels = []
+    @has_as_belongs_to_many_panels = []
 
+    @resource.get_fields.each do |field|
+      case field.class.to_s
+      when "Avo::Fields::HasOneField"
+        @has_one_panels << field
+      when "Avo::Fields::HasManyField"
+        @has_many_panels << field
+      when "Avo::Fields::HasAndBelongsToManyField"
+        @has_as_belongs_to_many_panels << field
+      else
+        @fields_by_panel[field.panel_name] ||= []
+        @fields_by_panel[field.panel_name] << field
+      end
     end
+  end
 end

data/app/controllers/avo/actions_controller.rb

@@ -1,4 +1,4 @@
-require_dependency 'avo/application_controller'
+require_dependency "avo/application_controller"
 
 module Avo
   class ActionsController < ApplicationController
@@ -6,61 +6,63 @@ module Avo
     before_action :set_resource
     before_action :set_action, only: [:show, :handle]
 
-    def show; end
+    def show
+      @model = ActionModel.new @action.get_attributes_for_action
+    end
 
     def handle
-      resource_ids = action_params[:fields][:resource_ids].split(',').map(&:to_i)
+      resource_ids = action_params[:fields][:resource_ids].split(",").map(&:to_i)
       models = @resource.model_class.find resource_ids
 
       fields = action_params[:fields].select do |key, value|
-        key != 'resource_ids'
+        key != "resource_ids"
       end
 
-      performed_action = @action.handle_action(request, models, fields)
+      performed_action = @action.handle_action(models: models, fields: fields)
 
       respond performed_action.response
     end
 
     private
-      def action_params
-        params.permit(:resource_name, :action_id, fields: {})
-      end
 
-      def set_action
-        action_class = params[:action_id].gsub('avo_actions_', '').classify.safe_constantize
+    def action_params
+      params.permit(:resource_name, :action_id, fields: {})
+    end
 
-        if params[:id].present?
-          model = @resource.model_class.find params[:id]
-        end
+    def set_action
+      action_class = params[:action_id].gsub("avo_actions_", "").classify.safe_constantize
 
-        @action = action_class.new
-        @action.hydrate(model: model, resource: resource, user: _current_user)
+      if params[:id].present?
+        model = @resource.model_class.find params[:id]
       end
 
-      def respond(response)
-        response[:type] ||= :reload
-        response[:message_type] ||= :notice
-        response[:message] ||= I18n.t('avo.action_ran_successfully')
+      @action = action_class.new(model: model, resource: resource, user: _current_user)
+    end
 
-        if response[:type] == :download
-          return send_data response[:path], filename: response[:filename]
-        end
+    def respond(response)
+      response[:type] ||= :reload
+      response[:message_type] ||= :notice
+      response[:message] ||= I18n.t("avo.action_ran_successfully")
 
-        respond_to do |format|
-          format.html do
-            if response[:type] == :redirect
-              path = response[:path]
+      if response[:type] == :download
+        return send_data response[:path], filename: response[:filename]
+      end
 
-              if path.respond_to? :call
-                path = instance_eval &path
-              end
+      respond_to do |format|
+        format.html do
+          if response[:type] == :redirect
+            path = response[:path]
 
-              redirect_to path, "#{response[:message_type]}": response[:message]
-            elsif response[:type] == :reload
-              redirect_back fallback_location: resources_path(@resource.model_class), "#{response[:message_type]}": response[:message]
+            if path.respond_to? :call
+              path = instance_eval(&path)
             end
+
+            redirect_to path, "#{response[:message_type]}": response[:message]
+          elsif response[:type] == :reload
+            redirect_back fallback_location: resources_path(@resource.model_class), "#{response[:message_type]}": response[:message]
           end
         end
       end
+    end
   end
 end