avo 3.0.0.pre18 → 3.0.0.pre19

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

@@ -4,5 +4,29 @@ class Avo::Fields::Common::BadgeViewerComponent < ViewComponent::Base
   def initialize(value:, options:)
     @value = value
     @options = options
+    @backgrounds = {
+      info: "bg-blue-500",
+      success: "bg-green-500",
+      danger: "bg-red-500",
+      warning: "bg-yellow-500",
+      neutral: "bg-gray-500"
+    }
+  end
+
+  def classes
+    background = :info
+
+    @options.invert.each do |values, type|
+      if [values].flatten.map { |value| value }.include? @value
+        background = type.to_sym
+        next
+      end
+    end
+
+    classes = "whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold block text-center truncate "
+
+    classes += "#{@backgrounds[background]} text-white" if @backgrounds[background].present?
+
+    classes
   end
 end

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

@@ -1,12 +1 @@
-<%
-  classes = 'h-6 float-left mr-1'
-
-  if @checked
-    classes += ' text-green-600'
-    icon = 'heroicons/outline/check-circle'
-  else
-    classes += ' text-red-500'
-    icon = 'heroicons/outline/x-circle'
-  end
-%>
-<%= helpers.svg "#{icon}.svg", class: classes %>
+<%= helpers.svg "#{@icon}.svg", class: @classes %>

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

@@ -2,6 +2,7 @@
 
 class Avo::Fields::Common::BooleanCheckComponent < ViewComponent::Base
   def initialize(checked: false)
-    @checked = checked
+    @icon = checked ? "heroicons/outline/check-circle" : "heroicons/outline/x-circle"
+    @classes = "h-6 #{checked ? "text-green-600" : "text-red-500"}"
   end
 end

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

@@ -9,4 +9,4 @@
   url = URI::HTTPS.build(host: "www.gravatar.com", path: "/avatar/#{@md5}", query: query)
   classes = @rounded ? 'rounded-full' : ''
 %>
-<%= link_to_if @link_to_resource.present?, image_tag(url.to_s, class: classes, width: options[:size], height: options[:size]), @link, title: @title %>
+<%= link_to_if @link_to_record.present?, image_tag(url.to_s, class: classes, width: options[:size], height: options[:size]), @link, title: @title %>

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 class Avo::Fields::Common::GravatarViewerComponent < ViewComponent::Base
-  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_resource: false, title: nil)
+  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_record: false, title: nil)
     @md5 = md5
     @link = link
     @default = default
     @size = size
     @rounded = rounded
-    @link_to_resource = link_to_resource
+    @link_to_record = link_to_record
     @title = title
   end
 end

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

@@ -1,14 +1,9 @@
 <div class="flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs">
   <div class="py-2 px-6 h-full w-full">
-    <% if empty %>
-    <% elsif value.present? %>
-      <% if as_html %>
-        <%= sanitize value %>
-      <% else %>
-        <div class="font-semibold uppercase"><%= value %></div>
-      <% end %>
+    <% if as_html %>
+      <%= sanitize value %>
     <% else %>
-      —
+      <div class="font-semibold uppercase"><%= value %></div>
     <% end %>
   </div>
 </div>

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

@@ -3,11 +3,9 @@
 class Avo::Fields::Common::HeadingComponent < ViewComponent::Base
   attr_reader :value
   attr_reader :as_html
-  attr_reader :empty
 
-  def initialize(value:, as_html:, empty:)
+  def initialize(value:, as_html:)
     @value = value
     @as_html = as_html
-    @empty = empty
   end
 end

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

@@ -3,7 +3,7 @@
   data-key-value-target="controller"
   data-options="<%= @field.options.to_json %>"
   data-input-classes="<%= input_classes %>"
-  data-editable="<%= @view.in?([:edit, :new]) %>"
+  data-editable="<%= @view.form? %>"
 >
   <div class="w-full flex flex-col">
     <div class="flex w-full">
@@ -14,7 +14,7 @@
         <div class="w-1/2 py-3 px-3 uppercase font-semibold text-xs text-white">
           <%= @field.value_label %>
         </div>
-        <% if @view.in?([:edit, :new]) %>
+        <% if @view.form? %>
           <div class="flex items-center justify-center p-2 px-3 border-l border-gray-600">
             <a href="javascript:void(0);"
               title="<%= @field.action_text %>"

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

@@ -5,9 +5,9 @@ class Avo::Fields::Common::KeyValueComponent < ViewComponent::Base
 
   attr_reader :view
 
-  def initialize(field:, form: nil, view: :show)
+  def initialize(field:, form: nil, view: "show")
     @field = field
     @form = form
-    @view = view
+    @view = Avo::ViewInquirer.new(view)
   end
 end

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

@@ -7,19 +7,13 @@ class Avo::Fields::Common::ProgressBarComponent < ViewComponent::Base
   attr_reader :max
   attr_reader :view
 
-  def initialize(value:, display_value: false, value_suffix: nil, max: 100, view: :index)
+  def initialize(value:, display_value: false, value_suffix: nil, max: 100, view: "index")
     @value = value
     @display_value = display_value
     @value_suffix = value_suffix
     @max = max
-    @view = view
+    @view = Avo::ViewInquirer.new(view)
   end
 
-  def show?
-    view == :show
-  end
-
-  def index?
-    view == :index
-  end
+  delegate :show?, :index?, to: :view
 end

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

@@ -2,12 +2,15 @@
   classes = "inline-block"
   classes += " text-red-600" if @status == 'failed'
   classes += " text-green-600" if @status == 'success'
+  classes += " text-gray-600" if @status == 'neutral'
 %>
 <div class="flex flex-shrink-0 <%= classes %> items-center">
   <% if @status == 'success' %>
     <%= helpers.svg 'heroicons/solid/check-circle', class: 'h-4' %>
   <% elsif @status == 'failed' %>
     <%= helpers.svg 'heroicons/solid/x-circle', class: 'h-4' %>
+  <% elsif @status == 'neutral' %>
+    <%= helpers.svg 'heroicons/solid/minus-circle', class: 'h-4' %>
   <% elsif @status == 'loading' %>
     <div class="spinner">
       <div class="double-bounce1 bg-gray-600"></div>

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

@@ -20,7 +20,7 @@ class Avo::Fields::EditComponent < ViewComponent::Base
     @multiple = multiple
     @resource = resource
     @stacked = stacked
-    @view = :edit
+    @view = Avo::ViewInquirer.new("edit")
   end
 
   def classes(extra_classes = "")

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

@@ -1,6 +1,6 @@
 <%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <% if @field.value.present? %>
-    <%= link_to_if @field.link_to_resource.present?,
+    <%= link_to_if @field.link_to_record.present?,
                    image_tag(@field.value,
                              height: @field.height,
                              style: "border-radius: #{@field.radius}px; max-height: #{@field.height}#{@field.height.to_s&.ends_with?('px') ? '' : 'px'};"),

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

@@ -1,9 +1,9 @@
 <%= index_field_wrapper **field_wrapper_args, flush: flush? do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
-      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>
+      <%= link_to_if @field.link_to_record, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>
     <% elsif @field.value.attached? && @field.is_audio %>
-      <%= link_to_if @field.link_to_resource, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full h-10'), resource_view_path, class: 'block h-8' %>
+      <%= link_to_if @field.link_to_record, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full h-10'), resource_view_path, class: 'block h-8' %>
     <% else %>
       <%= @field.value.filename %>
     <% end %>

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

@@ -4,7 +4,7 @@
     default: @field.default,
     size: @field.size,
     rounded: @field.rounded,
-    link_to_resource: @field.link_to_resource,
+    link_to_record: @field.link_to_record,
     link: resource_view_path,
     title: t('avo.view_item', item: @resource.name).humanize
   )

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

@@ -1,3 +1,3 @@
 <div <% if @index == 0 %> class="overflow-hidden rounded-t" <% end %> data-field-id="<%= @field.id %>">
-  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.name, as_html: @field.as_html, empty: @field.empty %>
+  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.value, as_html: @field.as_html %>
 </div>

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

@@ -1,3 +1,3 @@
 <div <% if @index == 0 %> class="overflow-hidden rounded-t" <% end %> data-field-id="<%= @field.id %>">
-  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.name, as_html: @field.as_html, empty: @field.empty %>
+  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.value, as_html: @field.as_html %>
 </div>

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

@@ -1,3 +1,3 @@
 <%= index_field_wrapper **field_wrapper_args, class: 'whitespace-no-wrap w-[1%]' do %>
-  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, resource_view_path, title: t('avo.view_item', item: @resource.name).humanize %>
+  <% link_to_if (@field.link_to_record or Avo.configuration.id_links_to_resource), @field.value, resource_view_path, title: t('avo.view_item', item: @resource.name).humanize %>
 <% end %>

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

@@ -13,7 +13,7 @@ class Avo::Fields::IndexComponent < Avo::BaseComponent
     @index = index
     @parent_record = parent_record
     @parent_resource = parent_resource
-    @view = :index
+    @view = Avo::ViewInquirer.new("index")
     @reflection = reflection
   end
 

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

@@ -18,7 +18,7 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
     @resource = resource
     @stacked = stacked
     @short = short
-    @view = :show
+    @view = Avo::ViewInquirer.new("show")
   end
 
   def wrapper_data

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/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

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

@@ -23,7 +23,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_view?
-    return false if Avo.configuration.resource_default_view == :edit
+    return false if Avo.configuration.resource_default_view.edit?
 
     return authorize_association_for(:show) if @reflection.present?
 

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

@@ -17,18 +17,12 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
 
   def encrypted_query
     # TODO: move this to the resource where we can apply the adapter pattern
-    serialized_query = if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
-      query.context.object.to_sql
-    else
-      return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)
-
-      query.all.to_sql
+    if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
+      @query = @query.result
     end
 
-    return if serialized_query.nil?
-
     Avo::Services::EncryptionService.encrypt(
-      message: serialized_query,
+      message: Marshal.dump(@query),
       purpose: :select_all
     )
   end

data/app/components/avo/resource_component.rb

@@ -53,11 +53,16 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def destroy_path
-    if params[:via_resource_class].present?
-      helpers.resource_path(record: @resource.record, resource: @resource, referrer: back_path)
-    else
-      helpers.resource_path(record: @resource.record, resource: @resource)
+    args = {record: @resource.record, resource: @resource}
+
+    args[:referrer] = if params[:via_resource_class].present?
+      back_path
+    # If we're deleting a resource from a parent resource, we need to go back to the parent resource page after the deletion
+    elsif @parent_resource.present?
+      helpers.resource_path(record: @parent_record, resource: @parent_resource)
     end
+
+    helpers.resource_path(**args)
   end
 
   # Ex: A Post has many Comments

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

@@ -1,12 +1,12 @@
 <div class="text-black border-gray-150 p-4 flex border-t">
-  <div class="flex-1 flex space-x-4">
+  <div class="flex-1 flex space-x-4 w-full">
     <% if avatar.present? %>
-      <div class="relative aspect-square w-10 h-10 overflow-hidden rounded">
+      <div class="relative aspect-square w-10 h-10 overflow-hidden rounded shrink-0">
         <%= image_tag avatar, class: "object-cover min-w-full min-h-full h-full" %>
       </div>
     <% end %>
-    <div class="flex flex-col">
-      <div class="font-medium">
+    <div class="flex flex-col pr-3 min-w-0">
+      <div class="font-medium text-ellipsis overflow-hidden">
         <%= name %>
       </div>
       <% if title.present? %>

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

@@ -25,7 +25,7 @@
       # On edit screens we want to load each tab because we wnst the DOM to have the fields present on form submission.
       # If you have a field which is in the second tab and it's required, the form submission will fail because the required field is not in view, and we don't want that.
       # We also want to load the current tab
-      should_lazy_load = if @view.to_s.in?(['edit', 'new', 'update', 'create'])
+      should_lazy_load = if @view.in?(%w[edit new update create])
         false
       else
         !is_current_tab

data/app/components/avo/tab_switcher_component.rb

@@ -33,11 +33,11 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   end
 
   def is_edit?
-    @view.in?([:edit, :update])
+    @view.in?(%w[edit update])
   end
 
   def is_new?
-    @view.in?([:new, :create])
+    @view.in?(%w[new create])
   end
 
   def is_initial_load?

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

@@ -44,26 +44,6 @@
             <%= render sidebar_component form: form %>
           <% end %>
         <% end %>
-        <% if Avo.configuration.buttons_on_form_footers %>
-          <% c.with_footer_tools do %>
-            <div class="mt-4">
-              <%= a_link back_path,
-              style: :text,
-              icon: 'arrow-left' do %>
-                <%= t('avo.cancel').capitalize %>
-              <% end %>
-              <% if can_see_the_save_button? %>
-                <%= a_button color: :primary,
-                style: :primary,
-                loading: true,
-                type: :submit,
-                icon: 'save' do %>
-                  <%= t('avo.save').capitalize %>
-                <% end %>
-              <% end %>
-            </div>
-          <% end %>
-        <% end %>
       <% end %>
       <%= content_tag :div, class: 'space-y-12' do %>
         <% @resource.get_items.each_with_index do |item, index| %>
@@ -71,6 +51,15 @@
           <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: view, form: form %>
         <% end %>
       <% end %>
+      <% if Avo.configuration.buttons_on_form_footers %>
+        <%= render Avo::PanelComponent.new do |c| %>
+          <% c.with_footer_tools do %>
+            <% @resource.render_edit_controls.each do |control| %>
+              <%= render_control control %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -3,11 +3,11 @@
 class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, record: nil, actions: [], view: :edit)
+  def initialize(resource: nil, record: nil, actions: [], view: "edit")
     @resource = resource
     @record = record
     @actions = actions
-    @view = view
+    @view = Avo::ViewInquirer.new(view)
   end
 
   def title
@@ -18,7 +18,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     return resource_view_path if via_resource?
     return resources_path if via_index?
 
-    if is_edit? && Avo.configuration.resource_default_view == :show # via resource show or edit page
+    if is_edit? && Avo.configuration.resource_default_view.show? # via resource show or edit page
       return helpers.resource_path(record: @resource.record, resource: @resource)
     end
 
@@ -34,7 +34,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def can_see_the_destroy_button?
-    return super if is_edit? && Avo.configuration.resource_default_view == :edit
+    return super if is_edit? && Avo.configuration.resource_default_view.edit?
 
     false
   end
@@ -52,7 +52,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def is_edit?
-    view.in?([:edit, :update])
+    view.in?(%w[edit update])
   end
 
   def form_method

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

@@ -34,7 +34,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @parent_record = parent_record
     @parent_resource = parent_resource
     @applied_filters = applied_filters
-    @view = :index
+    @view = Avo::ViewInquirer.new("index")
     @query = query
     @scopes = scopes
   end

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

@@ -4,7 +4,7 @@
     resource_name: @resource.class.to_s,
     record_id: @resource.record.id,
     selected_resources_name: @resource.model_key,
-    selected_resources: [@resource.record.id],
+    selected_resources: [@resource.record.to_param],
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>

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

@@ -10,7 +10,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     @actions = actions
     @parent_record = parent_record
     @parent_resource = parent_resource
-    @view = :show
+    @view = Avo::ViewInquirer.new("show")
   end
 
   def title

data/app/controllers/avo/actions_controller.rb

@@ -13,7 +13,7 @@ module Avo
 
     def show
       # Se the view to :new so the default value gets prefilled
-      @view = :new
+      @view = Avo::ViewInquirer.new("new")
 
       @resource.hydrate(record: @record, view: @view, user: _current_user, params: params)
       @record = ActionModel.new @action.get_attributes_for_action
@@ -21,23 +21,13 @@ module Avo
 
     def handle
       resource_ids = action_params[:fields][:avo_resource_ids].split(",")
-      @selected_query = action_params[:fields][:avo_selected_query]
 
-      fields = action_params[:fields].except(:avo_resource_ids, :avo_selected_query)
-
-      args = {
-        fields: fields,
+      performed_action = @action.handle_action(
+        fields: action_params[:fields].except(:avo_resource_ids, :avo_selected_query),
         current_user: _current_user,
-        resource: resource
-      }
-
-      args[:records] = if @selected_query.present?
-        @resource.model_class.find_by_sql decrypted_query
-      else
-        @resource.find_record resource_ids, params: params
-      end
-
-      performed_action = @action.handle_action(**args)
+        resource: resource,
+        query: decrypted_query || @resource.find_record(resource_ids, params: params)
+      )
 
       respond performed_action.response
     end
@@ -106,10 +96,9 @@ module Avo
     end
 
     def decrypted_query
-      Avo::Services::EncryptionService.decrypt(
-        message: @selected_query,
-        purpose: :select_all
-      )
+      return if (encrypted_query = action_params[:fields][:avo_selected_query]).blank?
+
+      Marshal.load(Avo::Services::EncryptionService.decrypt(message: encrypted_query, purpose: :select_all))
     end
 
     def decrypted_arguments

data/app/controllers/avo/application_controller.rb

@@ -115,7 +115,7 @@ module Avo
     def set_resource
       raise ActionController::RoutingError.new "No route matches" if resource.nil?
 
-      @resource = resource.new(view: action_name.to_sym, user: _current_user, params: params)
+      @resource = resource.new(view: action_name.to_s, user: _current_user, params: params)
 
       set_authorization
     end
@@ -149,12 +149,12 @@ module Avo
     end
 
     def set_view
-      @view = action_name.to_sym
+      @view = Avo::ViewInquirer.new(action_name.to_s)
     end
 
     def set_record_to_fill
-      @record_to_fill = @resource.model_class.new if @view == :create
-      @record_to_fill = @record if @view == :update
+      @record_to_fill = @resource.model_class.new if @view.create?
+      @record_to_fill = @record if @view.update?
 
       # If resource.record is nil, most likely the user is creating a new record.
       # In that case, to access resource.record in visible and readonly blocks we hydrate the resource with a new record.
@@ -167,7 +167,7 @@ module Avo
       return if is_attach_action?
 
       @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
-      assign_default_value_to_disabled_fields if @view == :create
+      assign_default_value_to_disabled_fields if @view.create?
     end
 
     def is_attach_action?