avo 3.0.1.beta8 → 3.0.1.beta9

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/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/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/resource_table_component.rb

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

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/controllers/avo/actions_controller.rb

@@ -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/search_controller.rb

@@ -42,14 +42,14 @@ module Avo
         query: resource.query_scope
       ).handle
 
+      query = apply_scope(query) if should_apply_any_scope?
+
       # Get the count
       results_count = query.reselect(resource.model_class.primary_key).count
 
       # Get the results
       query = query.limit(8)
 
-      query = apply_scope(query) if should_apply_any_scope?
-
       results = apply_search_metadata(query, resource)
 
       header = resource.plural_name

data/lib/avo/base_action.rb

@@ -101,39 +101,34 @@ module Avo
     end
 
     def handle_action(**args)
-      records, fields, current_user, resource = args.values_at(:records, :fields, :current_user, :resource)
-      # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
-      action_fields = get_field_definitions.map { |field| [field.id, field] }.to_h
-
-      # For some fields, like belongs_to, the id and database_id differ (user vs user_id).
-      # That's why we need to fetch the database_id for when we process the action.
-      action_fields_by_database_id = action_fields.map do |id, value|
-        [value.database_id.to_sym, value]
-      end.to_h
+      processed_fields = if args[:fields].present?
+        # Fetching the field definitions and not the actual fields (get_fields) because they will break if the user uses a `visible` block and adds a condition using the `params` variable. The params are different in the show method and the handle method.
+        action_fields = get_field_definitions.map { |field| [field.id, field] }.to_h
+
+        # For some fields, like belongs_to, the id and database_id differ (user vs user_id).
+        # That's why we need to fetch the database_id for when we process the action.
+        action_fields_by_database_id = action_fields.map do |id, value|
+          [value.database_id.to_sym, value]
+        end.to_h
 
-      if fields.present?
-        processed_fields = fields.to_unsafe_h.map do |name, value|
+        args[:fields].to_unsafe_h.map do |name, value|
           field = action_fields_by_database_id[name.to_sym]
 
           next if field.blank?
 
           [name, field.resolve_attribute(value)]
-        end
-
-        processed_fields = processed_fields.reject(&:blank?).to_h
+        end.reject(&:blank?).to_h
       else
-        processed_fields = {}
+        {}
       end
 
-      args = {
+      handle(
         fields: processed_fields.with_indifferent_access,
-        current_user: current_user,
-        resource: resource
-      }
-
-      args[:records] = records
-
-      handle(**args)
+        current_user: args[:current_user],
+        resource: args[:resource],
+        records: args[:query],
+        query: args[:query]
+      )
 
       self
     end

data/lib/avo/base_resource.rb

@@ -446,7 +446,7 @@ module Avo
     def hydrate_model_with_default_values
       default_values = get_fields
         .select do |field|
-          !field.computed
+          !field.computed && !field.is_a?(Avo::Fields::HeadingField)
         end
         .map do |field|
           value = field.value

data/lib/avo/concerns/filters_session_handler.rb

@@ -26,16 +26,16 @@ module Avo
       end
 
       def filters_session_key
-        @filters_session_key ||= '/filters/' << %w[
+        @filters_session_key ||= "/filters/" << %w[
           turbo_frame controller resource_name related_name
           action id
-        ].map { |key| params[key] }.compact.join('/')
+        ].map { |key| params[key] }.compact.join("/")
       end
 
       def cache_resource_filters?
         Avo::ExecutionContext.new(
           target: Avo.configuration.cache_resource_filters,
-          current_user: current_user,
+          current_user: _current_user,
           resource: @resource
         ).handle
       end

data/lib/avo/concerns/has_items.rb

@@ -30,10 +30,6 @@ module Avo
           deprecated_dsl_api __method__, "fields"
         end
 
-        def heading(body, **args)
-          deprecated_dsl_api __method__, "fields"
-        end
-
         def sidebar(**args, &block)
           deprecated_dsl_api __method__, "fields"
         end

data/lib/avo/fields/badge_field.rb

@@ -8,7 +8,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, secondary: :secondary}
+        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, neutral: :neutral}
         @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end

data/lib/avo/fields/base_field.rb

@@ -158,14 +158,7 @@ module Avo
 
         # Run computable callback block if present
         if computable && block.present?
-          final_value = Avo::ExecutionContext.new(
-            target: block,
-            record: record,
-            resource: @resource,
-            view: @view,
-            field: self,
-            include: self.class.included_modules
-          ).handle
+          final_value = execute_block
         end
 
         # Run the value through resolver if present
@@ -184,6 +177,17 @@ module Avo
         final_value
       end
 
+      def execute_block
+        Avo::ExecutionContext.new(
+          target: block,
+          record: record,
+          resource: resource,
+          view: view,
+          field: self,
+          include: self.class.included_modules
+        ).handle
+      end
+
       # Fills the record with the received value on create and update actions.
       def fill_field(record, key, value, params)
         return record unless record.methods.include? key.to_sym

data/lib/avo/fields/external_image_field.rb

@@ -4,12 +4,12 @@ module Avo
       attr_reader :width
       attr_reader :height
       attr_reader :radius
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
 
         @width = args[:width].present? ? args[:width] : 40
         @height = args[:height].present? ? args[:height] : 40

data/lib/avo/fields/file_field.rb

@@ -1,7 +1,7 @@
 module Avo
   module Fields
     class FileField < BaseField
-      attr_accessor :link_to_resource
+      attr_accessor :link_to_record
       attr_accessor :is_avatar
       attr_accessor :is_image
       attr_accessor :is_audio
@@ -12,7 +12,7 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
         @is_avatar = args[:is_avatar].present? ? args[:is_avatar] : false
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false

data/lib/avo/fields/gravatar_field.rb

@@ -4,7 +4,7 @@ require "erb"
 module Avo
   module Fields
     class GravatarField < BaseField
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
       attr_reader :rounded
       attr_reader :size
       attr_reader :default
@@ -16,7 +16,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
         @rounded = args[:rounded].nil? ? true : args[:rounded]
         @size = args[:size].present? ? args[:size].to_i : 32
         @default = args[:default].present? ? ERB::Util.url_encode(args[:default]).to_s : ""

data/lib/avo/fields/heading_field.rb

@@ -4,35 +4,27 @@ module Avo
   module Fields
     class HeadingField < BaseField
       attr_reader :as_html
-      attr_reader :empty
-
-      def initialize(content, **args, &block)
-        # Mark the field as empty if there's no content passed
-        @empty = content.blank?
-        # Add dummy content
-        content ||= SecureRandom.hex
 
+      def initialize(id, **args, &block)
         args[:updatable] = false
+        @label = args[:label] || id.to_s.humanize
 
-        super(content, **args, &block)
+        super(id, **args, &block)
 
         # this field is not used to update anything
         @for_presentation_only = true
 
         hide_on :index
 
-        @as_html = args[:as_html].present? ? args[:as_html] : false
+        @as_html = args[:as_html].presence || false
       end
 
       def id
         "heading_#{name.to_s.parameterize.underscore}"
       end
 
-      # Override the value method if the field is empty
       def value
-        return nil if empty
-
-        super
+        block.present? ? execute_block : @label
       end
     end
   end

data/lib/avo/fields/id_field.rb

@@ -1,7 +1,7 @@
 module Avo
   module Fields
     class IdField < BaseField
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
 
       def initialize(id, **args, &block)
         args[:readonly] = true
@@ -12,7 +12,7 @@ module Avo
 
         add_boolean_prop args, :sortable, true
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
       end
     end
   end

data/lib/avo/fields/text_field.rb

@@ -1,14 +1,14 @@
 module Avo
   module Fields
     class TextField < BaseField
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
       attr_reader :as_html
       attr_reader :protocol
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        add_boolean_prop args, :link_to_resource
+        add_boolean_prop args, :link_to_record
         add_boolean_prop args, :as_html
         add_string_prop args, :protocol
       end

data/lib/avo/resources/items/holder.rb

@@ -56,12 +56,6 @@ class Avo::Resources::Items::Holder
     add_item panel
   end
 
-  def heading(body = nil, **args, &block)
-    field = Avo::Fields::HeadingField.new(body, **args)
-
-    add_item field
-  end
-
   def sidebar(**args, &block)
     add_item Avo::Resources::Items::Sidebar::Builder.parse_block(**args, &block)
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.1.beta8" unless const_defined?(:VERSION)
+  VERSION = "3.0.1.beta9" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/js/install_generator.rb

@@ -31,7 +31,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", ["--partial", ":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_importmap_tags \"avo.custom\" %>"
@@ -48,7 +48,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", ["--partial", ":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_include_tag \"avo.custom\", \"data-turbo-track\": \"reload\", defer: true %>"

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -33,7 +33,7 @@ module Generators
           # Ensure that the _pre_head.html.erb template is available
           unless Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb").exist?
             say "Ejecting the _pre_head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":pre_head", "--skip-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", ["--partial", ":pre_head", "--skip-avo-version"], {destination_root: Rails.root})
           end
 
           say "Adding the CSS asset to the partial"

data/public/avo-assets/avo.base.css

@@ -6665,10 +6665,6 @@ tag.tagify__tag{
   float:right
 }
 
-.float-left{
-  float:left
-}
-
 .m-0{
   margin:0px
 }
@@ -7817,11 +7813,6 @@ tag.tagify__tag{
   background-color:rgb(57 158 229 / var(--tw-bg-opacity))
 }
 
-.bg-blue-50{
-  --tw-bg-opacity:1;
-  background-color:rgb(230 243 252 / var(--tw-bg-opacity))
-}
-
 .bg-blue-500{
   --tw-bg-opacity:1;
   background-color:rgb(8 134 222 / var(--tw-bg-opacity))
@@ -10238,6 +10229,10 @@ trix-editor {
     width:66.666667%
   }
 
+  .md\:w-full{
+    width:100%
+  }
+
   .md\:grid-cols-3{
     grid-template-columns:repeat(3, minmax(0, 1fr))
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.1.beta8
+  version: 3.0.1.beta9
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord