avo 2.21.1.pre.pr1476 → 2.21.1.pre.pr1484

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f832c5802957b7d88c4271b886cfcb0a727ad98b1d200dc1f8e6d7a5a779067
-  data.tar.gz: bb639aec120f3881847aa5ce53bd4bc399da0ae3fde37d01aad77ef13c017cbc
+  metadata.gz: 6b8cee2cababd0268d117574aafc0420608446a1b891eb1a8ff580d870c7e69d
+  data.tar.gz: 7e9246ff3da0857334ac9b823524f6455572f894352b63cf42fc2d09a7c0e226
 SHA512:
-  metadata.gz: 53180bdf4636c4dffd120fb8bb0f9ab0dacbbb9aad7e5ac3b906329144510b12b719591ebedb1dd2fb20d81a69d3a4932933d6500b4451e46947e9c3261885f0
-  data.tar.gz: 16f6f89ae35d3b8d1c491af4d3b35eee7148d56ee2dcfcdd7ec3a0b0bd16919a0f0424d93c6863f3a1d22acbb1d2be6cf02007122804fed43a11bd6229de491f
+  metadata.gz: 974f906c8484ff9126278cdf716f647ac6ebb9957fbbfe7537dc82873a3c20e2b132f53fe36e6cb1b80e86a862c811fae2a513d835bbd78bd60e852b31886ef4
+  data.tar.gz: f2d62cbe19efe4ed1b4e062dfe44d3ec8ae338b69873af0eb59467cf20670cac85ede4bfaab7d19b3b86c3a7dfe0a23ba2a713f55f856364c5b4b7cb9df90f8a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.21.1.pre.pr1476)
+    avo (2.21.1.pre.pr1484)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -409,7 +409,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
-    view_component (2.77.0)
+    view_component (2.78.0)
       activesupport (>= 5.0.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

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

@@ -4,7 +4,7 @@
 <div class="relative flex-1 flex flex-col items-center justify-center space-y-12 py-24">
   <%= helpers.svg view_type_svg, class: 'h-[250px]' %>
   <div class="text-gray-500 text-center">
-    <%= message %>
+    <%= text %>
   </div>
 </div>
 <% if @add_background %>

data/app/components/avo/empty_state_component.rb

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 
 class Avo::EmptyStateComponent < ViewComponent::Base
-  def initialize(message: nil, resource_name: nil, related_name: nil, view_type: :table, add_background: false)
+  attr_reader :message, :view_type, :add_background, :by_association
+
+  def initialize(message: nil, view_type: :table, add_background: false, by_association: false)
     @message = message
     @view_type = view_type
-    @related_name = related_name
-    @resource_name = resource_name
     @add_background = add_background
+    @by_association = by_association
   end
 
-  def message
-    return @message if @message.present?
-
-    translation_tag = @related_name.present? ? 'avo.no_related_item_found' : 'avo.no_item_found'
-    helpers.t translation_tag, item: @resource_name
+  def text
+    message || locale_message
   end
 
   def view_type_svg
-    return "grid-empty-state" if @view_type.to_sym == :grid
+    "#{view_type}-empty-state"
+  end
+
+  private
 
-    "table-empty-state"
+  def locale_message
+    helpers.t by_association ? 'avo.no_related_item_found' : 'avo.no_item_found'
   end
 end

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

@@ -8,7 +8,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   end
 
   def disabled
-    return true if @field.is_readonly?
+    return true if @field.is_readonly? || @field.is_disabled?
 
     # When visiting the record through it's association we keep the field disabled by default
     # We make an exception when the user deliberately instructs Avo to allow detaching in this scenario

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

@@ -4,7 +4,7 @@
       checked: @field.value,
       class: "text-lg h-4 w-4 checked:bg-primary-400 focus:checked:!bg-primary-400 #{@field.get_html(:classes, view: view, element: :input)}",
       data: @field.get_html(:data, view: view, element: :input),
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       style: @field.get_html(:style, view: view, element: :input)
     %>
   </div>

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

@@ -20,7 +20,7 @@
           <%= check_box_tag "#{model_param_key}[#{@field.id}][]", id, checked, {
               class: "w-4 h-4 #{@field.get_html(:classes, view: view, element: :input)}",
               data: @field.get_html(:data, view: view, element: :input),
-              disabled: @field.is_readonly?,
+              disabled: disabled?,
               id: "#{model_param_key}_#{@field.id}_#{id}",
               style: @field.get_html(:style, view: view, element: :input)
             } %> <%= label %>

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

@@ -8,12 +8,12 @@
         language: @field.language,
         theme: @field.theme,
         'tab-size': @field.tab_size,
-        'read-only': @field.is_readonly?,
+        'read-only': disabled?,
         'indent-with-tabs': @field.indent_with_tabs,
         'line-wrapping': @field.line_wrapping,
         **@field.get_html(:data, view: view, element: :input),
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

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

@@ -8,7 +8,7 @@
     },
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     style: @field.get_html(:style, view: view, element: :input),
     placeholder: @field.include_blank.present? ? nil : @field.placeholder
   %>

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

@@ -18,7 +18,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
@@ -30,7 +30,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

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

@@ -20,7 +20,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
@@ -32,7 +32,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

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

@@ -42,4 +42,8 @@ class Avo::Fields::EditComponent < ViewComponent::Base
       view: view
     }
   end
+
+  def disabled?
+    field.is_readonly? || field.is_disabled?
+  end
 end

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

@@ -2,7 +2,7 @@
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input)
   %>

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

@@ -10,7 +10,7 @@
       accept: @field.accept,
       data: @field.get_html(:data, view: view, element: :input),
       direct_upload: @field.direct_upload,
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       style: @field.get_html(:style, view: view, element: :input),
       class: "w-full"
     %>

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

@@ -7,7 +7,7 @@
         accept: @field.accept,
         data: @field.get_html(:data, view: view, element: :input),
         direct_upload: @field.direct_upload,
-        disabled: @field.is_readonly?,
+        disabled: disabled?,
         multiple: true,
         style: @field.get_html(:style, view: view, element: :input),
         class: "w-full"

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

@@ -5,7 +5,7 @@
 <% else %>
   <%= render Avo::PanelComponent.new(name: @field.name) do |c| %>
     <% c.tools do %>
-      <% if !@field.is_readonly? && can_attach? %>
+      <% if !@field.is_readonly? && !@field.is_disabled? && can_attach? %>
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
           color: :primary,
@@ -13,7 +13,7 @@
           <%= t('avo.attach_item', item: @field.name.downcase) %>
         <% end %>
       <% end %>
-      <% if !@field.is_readonly? && can_see_the_create_button? %>
+      <% if !@field.is_readonly? && !@field.is_disabled? && can_see_the_create_button? %>
         <%= a_link create_path,
           icon: 'heroicons/outline/plus',
           'data-target': 'create',
@@ -27,7 +27,7 @@
 
     <% c.body do %>
       <div class="py-8 flex justify-center items-center">
-        <%= empty_state resource_name: @field.id, related_name: params[:related_name] %>
+        <%= empty_state by_association: params[:related_name].present? %>
       </div>
     <% end %>
   <% end %>

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

@@ -7,7 +7,7 @@
         'simple-mde-target': 'element',
         'component-options': @field.options.to_json,
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

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

@@ -3,7 +3,7 @@
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full js-has-simple-mde-editor'),
       placeholder: @field.placeholder,
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       'data-simple-mde-target': 'element',
       'data-component-options': @field.options.to_json,
       'data-view': :show %>

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

@@ -2,7 +2,7 @@
   <%= @form.number_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     max: @field.max,
     min: @field.min,
     placeholder: @field.placeholder,

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

@@ -2,7 +2,7 @@
   <%= @form.password_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input)
     %>

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

@@ -7,7 +7,7 @@
   <%= @form.range_field @field.id,
     class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     max: @field.max,
     min: 0,
     placeholder: @field.placeholder,

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

@@ -7,7 +7,7 @@
     },
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     style: @field.get_html(:style, view: view, element: :input),
     value: @field.model.present? ? @field.model[@field.id] : @field.value,
     placeholder: @field.include_blank.present? ? nil : @field.placeholder

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

@@ -52,4 +52,8 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
       view: view
     }
   end
+
+  def disabled?
+    field.is_readonly? || field.is_disabled?
+  end
 end

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

@@ -2,7 +2,7 @@
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
     value: @resource.model.present? ? @resource.model[@field.id] : @field.value

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

@@ -6,7 +6,7 @@
       data: {
         'tags-field-target': 'fakeInput',
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
       value: ''
@@ -22,7 +22,7 @@
         'delimiters': @field.delimiters,
         'close-on-select': @field.close_on_select ? 1 : 0,
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input),
       value: @field.field_value.to_json

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

@@ -2,7 +2,7 @@
   <%= form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
     # value: @field.value,

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

@@ -2,7 +2,7 @@
   <%= @form.text_area @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
-    disabled: @field.is_readonly?,
+    disabled: disabled?,
     placeholder: @field.placeholder,
     rows: @field.rows,
     style: @field.get_html(:style, view: view, element: :input)

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

@@ -20,7 +20,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
@@ -32,7 +32,7 @@
         placeholder: @field.placeholder,
         **@field.get_html(:data, view: view, element: :input)
       },
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>

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

@@ -25,7 +25,7 @@
     <%= @form.text_area @field.id,
       class: classes("w-full hidden"),
       data: @field.get_html(:data, view: view, element: :input),
-      disabled: @field.is_readonly?,
+      disabled: disabled?,
       id: trix_id,
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)

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

@@ -9,6 +9,6 @@
   </div>
 <% else %>
   <div class="bg-white rounded shadow-panel">
-    <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: :grid %>
+    <%= helpers.empty_state by_association: params[:related_name].present?, view_type: :grid %>
   </div>
 <% end %>

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

@@ -25,11 +25,7 @@
               %> <%= t('avo.per_page').downcase %>
             </div>
             <% per_page_options.each do |option| %>
-              <% if parent_model.present? %>
-                <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
-              <% else %>
-                <%= link_to "Change to #{option} items per page", helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
-              <% end %>
+              <%= link_to "Change to #{option} items per page", change_items_per_page_url(option), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
             <% end %>
           </div>
         </div>

data/app/components/avo/paginator_component.rb

@@ -16,4 +16,12 @@ class Avo::PaginatorComponent < ViewComponent::Base
     @parent_model = parent_model
     @discreet_pagination = discreet_pagination
   end
+
+  def change_items_per_page_url(option)
+    if parent_model.present?
+      helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true, page: 1)
+    else
+      helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1)
+    end
+  end
 end

data/app/components/avo/resource_component.rb

@@ -68,12 +68,25 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
       if association_name.present?
         method_name = "#{policy_method}_#{association_name}?".to_sym
+
         # Use the policy methods from the parent (Post)
         service = reflection_resource.authorization
 
         if service.has_method?(method_name, raise_exception: false)
-          # Override the record with the child record (Comment not Post)
-          policy_result = service.authorize_action(method_name, record: resource.model, raise_exception: false)
+          # Some policy methods should get the parent record in order to have the necessarry information to do the authorization
+          # Example: Post->has_many->Comments
+          # When you want to authorize the creation/attaching of a Comment, you don't have the Comment instance.
+          # But you do have the Post instance and you can get that in your policy to authorize against.
+          parent_policy_methods = [:view, :create, :attach, :act_on]
+
+          record = if parent_policy_methods.include?(policy_method)
+            # Use the parent record (Post)
+            reflection_resource.model
+          else
+            # Override the record with the child record (Comment)
+            resource.model
+          end
+          policy_result = service.authorize_action(method_name, record: record, raise_exception: false)
         end
       end
     end

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

@@ -52,7 +52,7 @@
             <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
           </div>
         <% else %>
-          <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
+          <%= helpers.empty_state by_association: params[:related_name].present?, view_type: view_type, add_background: true %>
         <% end %>
       <% end %>
     <% end %>

data/app/controllers/avo/base_controller.rb

@@ -14,6 +14,7 @@ module Avo
     before_action :fill_model, only: [:create, :update]
     # Don't run base authorizations for associations
     before_action :authorize_base_action, if: -> { controller_name != "associations" }
+    before_action :set_pagy_locale, only: :index
 
     def index
       @page_title = @resource.plural_name.humanize
@@ -223,11 +224,11 @@ module Avo
         # In case there's an error somewhere else than the model
         # Example: When you save a license that should create a user for it and creating that user throws and error.
         # Example: When you Try to delete a record and has a foreign key constraint.
-        @errors = Array.wrap(exception.message)
+        exception_message = exception.message
       end
 
       # Add the errors from the model
-      @errors = Array.wrap([@errors, @model.errors.full_messages]).compact
+      @errors = @model.errors.full_messages.reject { |error| exception_message.include? error }.unshift exception_message
 
       succeeded
     end
@@ -510,5 +511,10 @@ module Avo
     def is_associated_record?
       params[:via_relation_class].present? && params[:via_resource_id].present?
     end
+
+    # Set pagy locale from params or from avo configuration, if both nil locale = "en"
+    def set_pagy_locale
+      @pagy_locale = locale.to_s || Avo.configuration.locale || "en"
+    end
   end
 end

data/app/javascript/js/controllers/fields/trix_field_controller.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-alert */
 import 'trix'
+import URI from 'urijs'
+
 import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../../helpers/cast_boolean'
 
@@ -35,7 +37,16 @@ export default class extends Controller {
   }
 
   get uploadUrl() {
-    return `${window.location.origin}${window.Avo.configuration.root_path}/avo_api/resources/${this.resourceName}/${this.resourceId}/attachments`
+    // Parse the current URL
+    const url = new URI(window.location.origin)
+    // Parse the root path
+    const rootPath = new URI(window.Avo.configuration.root_path)
+    // Build the trix field path
+    url.path(`${rootPath.path()}/avo_api/resources/${this.resourceName}/${this.resourceId}/attachments`)
+    // Add the params back
+    url.query(rootPath.query())
+
+    return url.toString()
   }
 
   connect() {

data/app/views/avo/base/_multiple_select_filter.html.erb

@@ -13,7 +13,7 @@
     %>
     <div class="flex justify-end">
       <%= a_button class: 'mt-4', color: :primary, size: :xs, data: { action: "multiple-select-filter#changeFilter" } do %>
-        Filter by <%=filter.name %>
+        <%= "#{t("avo.filter_by")} #{filter.name}" %>
       <% end %>
     </div>
     <%= link_to 'url_redirect', request.url, data: { 'multiple-select-filter-target': 'urlRedirect', 'turbo-frame': params[:turbo_frame] }, style: 'hidden', class: 'hidden' %>

data/app/views/avo/partials/_resource_search.html.erb

@@ -2,7 +2,7 @@
   <div class="w-full"
     data-search-target="autocomplete"
     data-search-resource="<%= resource %>"
-    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>", "placeholder": "<%= I18n.translate 'avo.search.placeholder' %>", "cancel_button": "<%= I18n.translate 'avo.search.cancel_button' %>"}'
     <% if via_reflection.present? %>
       data-via-association="<%= via_reflection[:association] %>"
       data-via-association-id="<%= via_reflection[:association_id] %>"

data/config/i18n-tasks.yml

@@ -3,7 +3,7 @@
 # The "main" locale.
 base_locale: en
 ## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-locales: [en, fr, nb, nn, pt-BR, ro, tr]
+locales: [en, fr, nb, nn, pt-BR, pt, ro, tr]
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 

data/config/initializers/pagy.rb

@@ -1 +1,17 @@
 require "pagy/extras/trim"
+
+# For locales without native pagy i18n support
+def pagy_locale_path(file_name)
+  Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "pagy", file_name)
+end
+
+Pagy::I18n.load(
+  { locale: 'en' },
+  { locale: 'fr' },
+  { locale: 'nb' },
+  { locale: 'pt-BR' },
+  { locale: 'pt' },
+  { locale: 'tr' },
+  { locale: 'nn', filepath: pagy_locale_path("nn.yml") },
+  { locale: 'ro', filepath: pagy_locale_path("ro.yml") },
+)

data/lib/avo/fields/base_field.rb

@@ -13,6 +13,7 @@ module Avo
       include Avo::Concerns::HasHTMLAttributes
       include Avo::Fields::Concerns::IsRequired
       include Avo::Fields::Concerns::IsReadonly
+      include Avo::Fields::Concerns::IsDisabled
       include Avo::Fields::Concerns::HasDefault
 
       delegate :view_context, to: ::Avo::App
@@ -64,6 +65,7 @@ module Avo
         @block = block
         @required = args.dig(:required) # Value if :required present on args, nil otherwise
         @readonly = args[:readonly] || false
+        @disabled = args[:disabled] || false
         @sortable = args[:sortable] || false
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]

data/lib/avo/fields/concerns/is_disabled.rb

@@ -0,0 +1,19 @@
+module Avo
+  module Fields
+    module Concerns
+      module IsDisabled
+        extend ActiveSupport::Concern
+
+        attr_reader :disabled
+
+        def is_disabled?
+          if disabled.respond_to? :call
+            Avo::Hosts::ResourceViewRecordHost.new(block: disabled, record: model, view: view, resource: resource).handle
+          else
+            disabled
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.21.1.pre.pr1476" unless const_defined?(:VERSION)
+  VERSION = "2.21.1.pre.pr1484" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/field/components/edit_component.html.erb.tt

@@ -2,5 +2,5 @@
   <%%= @form.text_field @field.id,
     class: classes("w-full"),
     placeholder: @field.placeholder,
-    disabled: @field.is_readonly? %>
+    disabled: disabled? %>
 <%% end %>