avo 3.0.1.beta8 → 3.0.1.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba8ff92bd87d9e0b8cfa4eb41412cfa4e919deb61bbd81612082ba0d439b329d
-  data.tar.gz: 9fb43629cf378585beb2d624f9fb9d83d1fdb60bc11053e3ea7f1fdfe9c868ec
+  metadata.gz: 022cb3e4cb686ce487ad3304f60e9971da143463b9adf66a710c40f483a2afb7
+  data.tar.gz: 1784442417d2bbe2204fa7e5ddfd08ecd07e6506e9850ca329d218025624540e
 SHA512:
-  metadata.gz: e95a674b3c497843b0924d55021dee3480bfa86d7495d99c3aa7536340fc3dfcad258bd6aba6a5575f39bb6a4a714354a99bc3adf739dd8ab305f9f3a1d9fa1c
-  data.tar.gz: eaf7a6e8a66b13160777724fe9ff8e1e9052f0376023c5ddeabb0a14033d28ab5b6d46f82e72d7f9a90fbec341a535a8a8d4dd2f925b1c6d46e31a887ebe8314
+  metadata.gz: 22417fabd06df79a9030be62f76f83585add1f3375fbccb9d0f089e1912a0a819a641302d826ed82611dabb7ffef5efc8c5d0949ed6e1c4a7ebe5129229a1542
+  data.tar.gz: 18f52cfabd9fa655fdf509021f898f425e3857b3e88b4b63c8be950bc25ae95fd64e6fc57b6883e83543c2414ac3e730f31515f75ef629115c17d25fd164d537

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.1.beta8)
+    avo (3.0.1.beta11)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/Rakefile

@@ -19,6 +19,8 @@ load "rails/tasks/engine.rake"
 
 load "rails/tasks/statistics.rake"
 
+load "lib/tasks/avo_tasks.rake"
+
 require "bundler/gem_tasks"
 
 require "rake/testtask"

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

@@ -3393,7 +3393,7 @@ body.dark,body[data-theme=dark]{
   transition:inherit
 }
 
-/*! tailwindcss v3.3.2 | MIT License | https://tailwindcss.com
+/*! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
  */
 
 /*
@@ -3583,6 +3583,10 @@ select,
 textarea {
   font-family: inherit;
   /* 1 */
+  font-feature-settings: inherit;
+  /* 1 */
+  font-variation-settings: inherit;
+  /* 1 */
   font-size: 100%;
   /* 1 */
   font-weight: inherit;
@@ -3733,6 +3737,14 @@ menu {
   padding: 0;
 }
 
+/*
+Reset default styling for dialogs.
+*/
+
+dialog {
+  padding: 0;
+}
+
 /*
 Prevent resizing textareas horizontally by default.
 */
@@ -6665,10 +6677,6 @@ tag.tagify__tag{
   float:right
 }
 
-.float-left{
-  float:left
-}
-
 .m-0{
   margin:0px
 }
@@ -7809,11 +7817,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))
@@ -10226,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))
   }

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 md:w-full <% 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">
     <% if form.present? %>
       <%= form.label field.id, label %>
     <% else %>

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

@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, center_content: true, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, flush: true do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

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

@@ -1,25 +1 @@
-<%
-  backgrounds = {
-    info: 'bg-blue-500',
-    success: 'bg-green-500',
-    danger: 'bg-red-500',
-    warning: 'bg-yellow-500',
-    secondary: 'bg-gray-500',
-  }
-
-  label = @value
-  background = :info
-
-  @options.invert.each do |values, type|
-    if [values].flatten.map { |value| value }.include? @value
-      label = @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?
-%>
-<span class="<%= classes %>" style="max-width: 120px;"><%= label %></span>
+<span class="<%= classes %>" style="max-width: 120px;"><%= @value %></span>

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

@@ -25,6 +25,7 @@ module Avo
     before_action :add_initial_breadcrumbs
     before_action :set_view
     before_action :set_sidebar_open
+    before_action :set_stylesheet_assets_path
 
     rescue_from Avo::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
@@ -314,5 +315,16 @@ module Avo
     rescue => exception
       Avo.logger.debug "Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
     end
+
+    def set_stylesheet_assets_path
+      # Prefer the user's tailwind config if it exists, otherwise use the default one from Avo
+      @stylesheet_assets_path = if Rails.root.join("config", "avo", "tailwind.config.js").exist?
+        "avo.tailwind"
+      elsif Avo::PACKED
+        "/avo-assets/avo.base"
+      else
+        "avo.base"
+      end
+    end
   end
 end

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/app/views/layouts/avo/application.html.erb

@@ -10,12 +10,11 @@
     <%= render partial: 'avo/partials/branding' %>
     <%= render partial: 'avo/partials/pre_head' %>
     <%= render Avo::AssetManager::StylesheetComponent.new asset_manager: Avo.asset_manager %>
+    <%= stylesheet_link_tag @stylesheet_assets_path, "data-turbo-track": "reload", defer: true %>
     <% if Avo::PACKED %>
       <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
     <% else %>
       <%= javascript_include_tag "avo.base", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "avo.base", "data-turbo-track": "reload", defer: true %>
       <% if Rails.env.development? %>
         <%= javascript_include_tag "hotwire-livereload", defer: true %>
       <% end %>

data/avo.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.0.0"
   spec.post_install_message = "Thank you for using Avo 💪  Docs are available at https://docs.avohq.io"
 
-  spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
+  spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock", "tailwind.preset.js"]
 
   spec.add_dependency "activerecord", ">= 6.1"
   spec.add_dependency "activesupport", ">= 6.1"

data/bin/dev

@@ -3,6 +3,8 @@
 PORT="${PORT:-3030}"
 export PORT
 
+bundle exec rake avo:sym_link
+
 if command -v overmind &> /dev/null; then
   overmind start -f Procfile.dev "$@"
 else

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