From 4a8af34609f27cba57d2469d630fee2501e5e627 Mon Sep 17 00:00:00 2001
From: Iain Beeston <iainbeeston@users.noreply.github.com>
Date: Mon, 20 Jan 2025 12:53:29 +0000
Subject: [PATCH] Fixed argument prefix warnings

If I run an app using avo with warnings enabled I get a LOT of warnings like this:

    avo-3.16.1/app/components/avo/fields/files_field/edit_component.html.erb:1: warning: `**' interpreted as argument prefix

This is happening because a function is being called with `**` as the first argument but there are no brackets around the arguments. Adding brackets fixes the warning but it does not change the meaning, so I've done that for all field components.
---
 .../avo/fields/area_field/edit_component.html.erb           | 2 +-
 .../avo/fields/area_field/show_component.html.erb           | 2 +-
 .../avo/fields/badge_field/index_component.html.erb         | 2 +-
 .../avo/fields/badge_field/show_component.html.erb          | 2 +-
 .../avo/fields/belongs_to_field/edit_component.html.erb     | 6 +++---
 .../avo/fields/belongs_to_field/index_component.html.erb    | 2 +-
 .../avo/fields/belongs_to_field/show_component.html.erb     | 2 +-
 .../avo/fields/boolean_field/edit_component.html.erb        | 2 +-
 .../avo/fields/boolean_field/index_component.html.erb       | 2 +-
 .../avo/fields/boolean_field/show_component.html.erb        | 2 +-
 .../avo/fields/boolean_group_field/edit_component.html.erb  | 2 +-
 .../avo/fields/boolean_group_field/index_component.html.erb | 2 +-
 .../avo/fields/boolean_group_field/show_component.html.erb  | 2 +-
 .../avo/fields/code_field/edit_component.html.erb           | 2 +-
 .../avo/fields/code_field/show_component.html.erb           | 2 +-
 .../avo/fields/country_field/edit_component.html.erb        | 2 +-
 .../avo/fields/country_field/index_component.html.erb       | 2 +-
 .../avo/fields/country_field/show_component.html.erb        | 2 +-
 .../avo/fields/date_field/edit_component.html.erb           | 2 +-
 .../avo/fields/date_field/index_component.html.erb          | 2 +-
 .../avo/fields/date_field/show_component.html.erb           | 2 +-
 .../avo/fields/date_time_field/edit_component.html.erb      | 2 +-
 .../avo/fields/date_time_field/index_component.html.erb     | 2 +-
 .../avo/fields/date_time_field/show_component.html.erb      | 2 +-
 .../avo/fields/external_image_field/edit_component.html.erb | 2 +-
 .../fields/external_image_field/index_component.html.erb    | 2 +-
 .../avo/fields/external_image_field/show_component.html.erb | 2 +-
 .../avo/fields/file_field/edit_component.html.erb           | 2 +-
 .../avo/fields/file_field/index_component.html.erb          | 2 +-
 .../avo/fields/file_field/show_component.html.erb           | 2 +-
 .../avo/fields/files_field/edit_component.html.erb          | 2 +-
 .../avo/fields/files_field/index_component.html.erb         | 2 +-
 .../avo/fields/files_field/show_component.html.erb          | 2 +-
 .../avo/fields/gravatar_field/index_component.html.erb      | 2 +-
 .../avo/fields/gravatar_field/show_component.html.erb       | 2 +-
 .../avo/fields/has_one_field/index_component.html.erb       | 2 +-
 app/components/avo/fields/id_field/edit_component.html.erb  | 2 +-
 app/components/avo/fields/id_field/index_component.html.erb | 2 +-
 app/components/avo/fields/id_field/show_component.html.erb  | 2 +-
 .../avo/fields/key_value_field/edit_component.html.erb      | 2 +-
 .../avo/fields/key_value_field/show_component.html.erb      | 2 +-
 .../avo/fields/location_field/edit_component.html.erb       | 2 +-
 .../avo/fields/location_field/show_component.html.erb       | 2 +-
 .../avo/fields/markdown_field/edit_component.html.erb       | 2 +-
 .../avo/fields/markdown_field/show_component.html.erb       | 2 +-
 .../avo/fields/number_field/edit_component.html.erb         | 2 +-
 .../avo/fields/number_field/index_component.html.erb        | 2 +-
 .../avo/fields/number_field/show_component.html.erb         | 2 +-
 .../avo/fields/password_field/edit_component.html.erb       | 2 +-
 .../avo/fields/preview_field/index_component.html.erb       | 2 +-
 .../avo/fields/progress_bar_field/edit_component.html.erb   | 2 +-
 .../avo/fields/progress_bar_field/index_component.html.erb  | 2 +-
 .../avo/fields/progress_bar_field/show_component.html.erb   | 2 +-
 .../avo/fields/radio_field/edit_component.html.erb          | 2 +-
 .../avo/fields/radio_field/index_component.html.erb         | 2 +-
 .../avo/fields/radio_field/show_component.html.erb          | 2 +-
 .../avo/fields/select_field/edit_component.html.erb         | 2 +-
 .../avo/fields/select_field/index_component.html.erb        | 2 +-
 .../avo/fields/select_field/show_component.html.erb         | 2 +-
 .../avo/fields/status_field/edit_component.html.erb         | 2 +-
 .../avo/fields/status_field/index_component.html.erb        | 2 +-
 .../avo/fields/status_field/show_component.html.erb         | 2 +-
 .../avo/fields/tags_field/edit_component.html.erb           | 4 ++--
 .../avo/fields/tags_field/index_component.html.erb          | 2 +-
 .../avo/fields/tags_field/show_component.html.erb           | 2 +-
 .../avo/fields/text_field/edit_component.html.erb           | 2 +-
 .../avo/fields/text_field/index_component.html.erb          | 2 +-
 .../avo/fields/text_field/show_component.html.erb           | 2 +-
 .../avo/fields/textarea_field/edit_component.html.erb       | 2 +-
 .../avo/fields/textarea_field/show_component.html.erb       | 2 +-
 .../avo/fields/time_field/edit_component.html.erb           | 2 +-
 .../avo/fields/time_field/index_component.html.erb          | 2 +-
 .../avo/fields/time_field/show_component.html.erb           | 2 +-
 .../avo/fields/tiptap_field/edit_component.html.erb         | 2 +-
 .../avo/fields/tiptap_field/show_component.html.erb         | 2 +-
 .../avo/fields/trix_field/edit_component.html.erb           | 2 +-
 .../avo/fields/trix_field/show_component.html.erb           | 2 +-
 77 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/app/components/avo/fields/area_field/edit_component.html.erb b/app/components/avo/fields/area_field/edit_component.html.erb
index 28ffcb87e8..5b410aa6d1 100644
--- a/app/components/avo/fields/area_field/edit_component.html.erb
+++ b/app/components/avo/fields/area_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_field field.id,
     value: field.value.to_s,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/area_field/show_component.html.erb b/app/components/avo/fields/area_field/show_component.html.erb
index f4377507c7..0466bf9de5 100644
--- a/app/components/avo/fields/area_field/show_component.html.erb
+++ b/app/components/avo/fields/area_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if field.value.present? %>
     <%= area_map field.map_data, **field.mapkick_options %>
   <% else %>
diff --git a/app/components/avo/fields/badge_field/index_component.html.erb b/app/components/avo/fields/badge_field/index_component.html.erb
index 4fdf9e07b1..6d137ecb98 100644
--- a/app/components/avo/fields/badge_field/index_component.html.erb
+++ b/app/components/avo/fields/badge_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::BadgeViewerComponent.new value: @field.value, options: @field.options %>
 <% end %>
diff --git a/app/components/avo/fields/badge_field/show_component.html.erb b/app/components/avo/fields/badge_field/show_component.html.erb
index 461a7b8bbe..b18ed6fded 100644
--- a/app/components/avo/fields/badge_field/show_component.html.erb
+++ b/app/components/avo/fields/badge_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::BadgeViewerComponent.new value: @field.value, options: @field.options %>
 <% end %>
diff --git a/app/components/avo/fields/belongs_to_field/edit_component.html.erb b/app/components/avo/fields/belongs_to_field/edit_component.html.erb
index b38be635bd..5d7a30e362 100644
--- a/app/components/avo/fields/belongs_to_field/edit_component.html.erb
+++ b/app/components/avo/fields/belongs_to_field/edit_component.html.erb
@@ -5,7 +5,7 @@
       data-association="<%= @field.id %>"
       data-association-class="<%= @field&.target_resource&.model_class || nil %>"
     >
-    <%= field_wrapper **field_wrapper_args, label_for: @field.polymorphic_form_field_label, help: @field.polymorphic_help || '' do %>
+    <%= field_wrapper(**field_wrapper_args, label_for: @field.polymorphic_form_field_label, help: @field.polymorphic_help || '') do %>
       <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
       {
         value: @field.value,
@@ -32,7 +32,7 @@
     <% @field.types.each do |type| %>
       <template data-belongs-to-field-target="type" data-type="<%= type %>">
         <div data-polymorphic-type="<%= type %>">
-          <%= field_wrapper **field_wrapper_args.merge!(data: reload_data), label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
+          <%= field_wrapper(**field_wrapper_args.merge!(data: reload_data), label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name) do %>
             <% if @field.is_searchable? %>
               <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
                 disabled: disabled,
@@ -88,7 +88,7 @@
     <% end %>
   </div>
 <% else %>
-  <%= field_wrapper **field_wrapper_args.merge!(data: reload_data) do %>
+  <%= field_wrapper(**field_wrapper_args.merge!(data: reload_data)) do %>
     <% if @field.is_searchable? %>
       <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
         field: @field,
diff --git a/app/components/avo/fields/belongs_to_field/index_component.html.erb b/app/components/avo/fields/belongs_to_field/index_component.html.erb
index 7431df8fd2..78a3e40e8b 100644
--- a/app/components/avo/fields/belongs_to_field/index_component.html.erb
+++ b/app/components/avo/fields/belongs_to_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= link_to @field.label, helpers.resource_view_path(
     record: @field.index_link_to_record,
     resource: @field.index_link_to_resource
diff --git a/app/components/avo/fields/belongs_to_field/show_component.html.erb b/app/components/avo/fields/belongs_to_field/show_component.html.erb
index f87c7a152b..d501f44a9e 100644
--- a/app/components/avo/fields/belongs_to_field/show_component.html.erb
+++ b/app/components/avo/fields/belongs_to_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= link_to @field.label, resource_view_path, data: {turbo_frame: @field.target} %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_field/edit_component.html.erb b/app/components/avo/fields/boolean_field/edit_component.html.erb
index fd3327649a..b05e41f07a 100644
--- a/app/components/avo/fields/boolean_field/edit_component.html.erb
+++ b/app/components/avo/fields/boolean_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="h-8 flex items-center">
     <%= @form.check_box @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/boolean_field/index_component.html.erb b/app/components/avo/fields/boolean_field/index_component.html.erb
index fb7a33c854..900de4f670 100644
--- a/app/components/avo/fields/boolean_field/index_component.html.erb
+++ b/app/components/avo/fields/boolean_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_field/show_component.html.erb b/app/components/avo/fields/boolean_field/show_component.html.erb
index ffee935ed8..9392e97349 100644
--- a/app/components/avo/fields/boolean_field/show_component.html.erb
+++ b/app/components/avo/fields/boolean_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_group_field/edit_component.html.erb b/app/components/avo/fields/boolean_group_field/edit_component.html.erb
index 7b0991b0ac..65d8b45466 100644
--- a/app/components/avo/fields/boolean_group_field/edit_component.html.erb
+++ b/app/components/avo/fields/boolean_group_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="flex items-center">
     <div class="space-y-2">
       <% @field.options.each do |id, label| %>
diff --git a/app/components/avo/fields/boolean_group_field/index_component.html.erb b/app/components/avo/fields/boolean_group_field/index_component.html.erb
index 403f405816..cf2583e8ab 100644
--- a/app/components/avo/fields/boolean_group_field/index_component.html.erb
+++ b/app/components/avo/fields/boolean_group_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false do %>
+<%= index_field_wrapper(**field_wrapper_args, dash_if_blank: false) do %>
   <%= render Avo::Fields::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/boolean_group_field/show_component.html.erb b/app/components/avo/fields/boolean_group_field/show_component.html.erb
index 2c622dd26d..72fd75fde7 100644
--- a/app/components/avo/fields/boolean_group_field/show_component.html.erb
+++ b/app/components/avo/fields/boolean_group_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
+<%= field_wrapper(**field_wrapper_args, dash_if_blank: false) do %>
   <%= render Avo::Fields::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/code_field/edit_component.html.erb b/app/components/avo/fields/code_field/edit_component.html.erb
index fc424d7523..76fce9ef2d 100644
--- a/app/components/avo/fields/code_field/edit_component.html.erb
+++ b/app/components/avo/fields/code_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="code-field">
     <%= @form.text_area @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/code_field/show_component.html.erb b/app/components/avo/fields/code_field/show_component.html.erb
index 7f3349eea0..6b3b75bad4 100644
--- a/app/components/avo/fields/code_field/show_component.html.erb
+++ b/app/components/avo/fields/code_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="code-field" style="--height: <%= @field.height %>">
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full'),
diff --git a/app/components/avo/fields/country_field/edit_component.html.erb b/app/components/avo/fields/country_field/edit_component.html.erb
index eceb336c1b..dea2562df6 100644
--- a/app/components/avo/fields/country_field/edit_component.html.erb
+++ b/app/components/avo/fields/country_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.select @field.id, @field.select_options, {
       value: @field.value,
       selected: @field.value,
diff --git a/app/components/avo/fields/country_field/index_component.html.erb b/app/components/avo/fields/country_field/index_component.html.erb
index 9e5641b1cf..26feb80917 100644
--- a/app/components/avo/fields/country_field/index_component.html.erb
+++ b/app/components/avo/fields/country_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <% if @field.display_code %>
     <%= @field.value %>
   <% else %>
diff --git a/app/components/avo/fields/country_field/show_component.html.erb b/app/components/avo/fields/country_field/show_component.html.erb
index 1876393e9d..221e8b0500 100644
--- a/app/components/avo/fields/country_field/show_component.html.erb
+++ b/app/components/avo/fields/country_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.display_code %>
     <%= @field.value %>
   <% else %>
diff --git a/app/components/avo/fields/date_field/edit_component.html.erb b/app/components/avo/fields/date_field/edit_component.html.erb
index 9b531b5ed2..94250ed584 100644
--- a/app/components/avo/fields/date_field/edit_component.html.erb
+++ b/app/components/avo/fields/date_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
       controller: "date-field",
       date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_field/index_component.html.erb b/app/components/avo/fields/date_field/index_component.html.erb
index cc1d1fa297..5ad0b84b21 100644
--- a/app/components/avo/fields/date_field/index_component.html.erb
+++ b/app/components/avo/fields/date_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_field/show_component.html.erb b/app/components/avo/fields/date_field/show_component.html.erb
index 5816df1dd6..c07306d57e 100644
--- a/app/components/avo/fields/date_field/show_component.html.erb
+++ b/app/components/avo/fields/date_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_time_field/edit_component.html.erb b/app/components/avo/fields/date_time_field/edit_component.html.erb
index d255673ded..283c2da58a 100644
--- a/app/components/avo/fields/date_time_field/edit_component.html.erb
+++ b/app/components/avo/fields/date_time_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, class: "flex relative", data: {
       controller: "date-field",
       date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_time_field/index_component.html.erb b/app/components/avo/fields/date_time_field/index_component.html.erb
index 05aea8b09b..9549c3dd7f 100644
--- a/app/components/avo/fields/date_time_field/index_component.html.erb
+++ b/app/components/avo/fields/date_time_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/date_time_field/show_component.html.erb b/app/components/avo/fields/date_time_field/show_component.html.erb
index 9a64a75ffc..806520d532 100644
--- a/app/components/avo/fields/date_time_field/show_component.html.erb
+++ b/app/components/avo/fields/date_time_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/external_image_field/edit_component.html.erb b/app/components/avo/fields/external_image_field/edit_component.html.erb
index 01cadfbaff..fba5988ac6 100644
--- a/app/components/avo/fields/external_image_field/edit_component.html.erb
+++ b/app/components/avo/fields/external_image_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
diff --git a/app/components/avo/fields/external_image_field/index_component.html.erb b/app/components/avo/fields/external_image_field/index_component.html.erb
index 5e7e4e4f0f..2af824b7b5 100644
--- a/app/components/avo/fields/external_image_field/index_component.html.erb
+++ b/app/components/avo/fields/external_image_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <% if @field.value.present? %>
     <%= link_to_if @field.link_to_record.present?,
                    image_tag(@field.value,
diff --git a/app/components/avo/fields/external_image_field/show_component.html.erb b/app/components/avo/fields/external_image_field/show_component.html.erb
index d3eab59e2b..e62beb0234 100644
--- a/app/components/avo/fields/external_image_field/show_component.html.erb
+++ b/app/components/avo/fields/external_image_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.value.present? %>
     <%= image_tag @field.value, style: 'max-width: 340px;' %>
   <% end %>
diff --git a/app/components/avo/fields/file_field/edit_component.html.erb b/app/components/avo/fields/file_field/edit_component.html.erb
index f43a354b44..d17ddec1fd 100644
--- a/app/components/avo/fields/file_field/edit_component.html.erb
+++ b/app/components/avo/fields/file_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.value.present? %>
     <div class="mb-2">
       <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
diff --git a/app/components/avo/fields/file_field/index_component.html.erb b/app/components/avo/fields/file_field/index_component.html.erb
index 0ccd2deef0..16e3b5210e 100644
--- a/app/components/avo/fields/file_field/index_component.html.erb
+++ b/app/components/avo/fields/file_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: flush? do %>
+<%= 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_record, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>
diff --git a/app/components/avo/fields/file_field/show_component.html.erb b/app/components/avo/fields/file_field/show_component.html.erb
index e5275b9eab..e722ffc55f 100644
--- a/app/components/avo/fields/file_field/show_component.html.erb
+++ b/app/components/avo/fields/file_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
 <% end %>
diff --git a/app/components/avo/fields/files_field/edit_component.html.erb b/app/components/avo/fields/files_field/edit_component.html.erb
index 78416306f3..0ceac822d4 100644
--- a/app/components/avo/fields/files_field/edit_component.html.erb
+++ b/app/components/avo/fields/files_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if can_upload_file? %>
diff --git a/app/components/avo/fields/files_field/index_component.html.erb b/app/components/avo/fields/files_field/index_component.html.erb
index ef4874b636..4886f7a5d6 100644
--- a/app/components/avo/fields/files_field/index_component.html.erb
+++ b/app/components/avo/fields/files_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= "#{length} #{t('avo.file', count: length)}" %>
 <% end %>
diff --git a/app/components/avo/fields/files_field/show_component.html.erb b/app/components/avo/fields/files_field/show_component.html.erb
index d7a699460a..4bd21b5158 100644
--- a/app/components/avo/fields/files_field/show_component.html.erb
+++ b/app/components/avo/fields/files_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% end %>
diff --git a/app/components/avo/fields/gravatar_field/index_component.html.erb b/app/components/avo/fields/gravatar_field/index_component.html.erb
index eedfc86fed..0c982b713e 100644
--- a/app/components/avo/fields/gravatar_field/index_component.html.erb
+++ b/app/components/avo/fields/gravatar_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::GravatarViewerComponent.new(
     md5: @field.md5,
     default: @field.default,
diff --git a/app/components/avo/fields/gravatar_field/show_component.html.erb b/app/components/avo/fields/gravatar_field/show_component.html.erb
index 7d7030e9b4..ee83b26ba4 100644
--- a/app/components/avo/fields/gravatar_field/show_component.html.erb
+++ b/app/components/avo/fields/gravatar_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::GravatarViewerComponent.new(
     md5: @field.md5,
     default: @field.default,
diff --git a/app/components/avo/fields/has_one_field/index_component.html.erb b/app/components/avo/fields/has_one_field/index_component.html.erb
index f90a0f309f..98889749d9 100644
--- a/app/components/avo/fields/has_one_field/index_component.html.erb
+++ b/app/components/avo/fields/has_one_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= link_to @field.label, helpers.resource_path(record: @field.value, resource: @field.target_resource) %>
 <% end %>
diff --git a/app/components/avo/fields/id_field/edit_component.html.erb b/app/components/avo/fields/id_field/edit_component.html.erb
index d7740937a7..de27aa8c7f 100644
--- a/app/components/avo/fields/id_field/edit_component.html.erb
+++ b/app/components/avo/fields/id_field/edit_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/id_field/index_component.html.erb b/app/components/avo/fields/id_field/index_component.html.erb
index 6ee29db9c3..a7b13aa6de 100644
--- a/app/components/avo/fields/id_field/index_component.html.erb
+++ b/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 %>
+<%= index_field_wrapper(**field_wrapper_args, class: 'whitespace-no-wrap w-[1%]') do %>
   <% 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 %>
diff --git a/app/components/avo/fields/id_field/show_component.html.erb b/app/components/avo/fields/id_field/show_component.html.erb
index d7740937a7..de27aa8c7f 100644
--- a/app/components/avo/fields/id_field/show_component.html.erb
+++ b/app/components/avo/fields/id_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/key_value_field/edit_component.html.erb b/app/components/avo/fields/key_value_field/edit_component.html.erb
index 1a90bc9844..afe890faa1 100644
--- a/app/components/avo/fields/key_value_field/edit_component.html.erb
+++ b/app/components/avo/fields/key_value_field/edit_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::KeyValueComponent.new field: @field, form: @form, view: view %>
 <% end %>
diff --git a/app/components/avo/fields/key_value_field/show_component.html.erb b/app/components/avo/fields/key_value_field/show_component.html.erb
index cf3354b561..2c0dfffb28 100644
--- a/app/components/avo/fields/key_value_field/show_component.html.erb
+++ b/app/components/avo/fields/key_value_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <%= render Avo::Fields::Common::KeyValueComponent.new(
       field: @field,
       view: Avo::ViewInquirer.new(:show)
diff --git a/app/components/avo/fields/location_field/edit_component.html.erb b/app/components/avo/fields/location_field/edit_component.html.erb
index 671e2e549c..902f928a08 100644
--- a/app/components/avo/fields/location_field/edit_component.html.erb
+++ b/app/components/avo/fields/location_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if field.value_as_array? %>
     <div class="flex gap-4">
       <%= @form.fields_for @field.id do |coordinates_form| %>
diff --git a/app/components/avo/fields/location_field/show_component.html.erb b/app/components/avo/fields/location_field/show_component.html.erb
index e67862e231..d7623eb2ae 100644
--- a/app/components/avo/fields/location_field/show_component.html.erb
+++ b/app/components/avo/fields/location_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if field.value_present? %>
     <%= js_map [{latitude: field.value[0], longitude: field.value[1]}], id: "location-map", zoom: field.zoom, controls: true, **field.mapkick_options %>
   <% else %>
diff --git a/app/components/avo/fields/markdown_field/edit_component.html.erb b/app/components/avo/fields/markdown_field/edit_component.html.erb
index 51724f4e2d..7ed3b7f7ac 100644
--- a/app/components/avo/fields/markdown_field/edit_component.html.erb
+++ b/app/components/avo/fields/markdown_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="easy-mde">
     <%= @form.text_area @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/markdown_field/show_component.html.erb b/app/components/avo/fields/markdown_field/show_component.html.erb
index 822045e6f8..4aa97528fc 100644
--- a/app/components/avo/fields/markdown_field/show_component.html.erb
+++ b/app/components/avo/fields/markdown_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
+<%= field_wrapper(**field_wrapper_args, full_width: true) do %>
   <div data-controller="easy-mde">
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full js-has-easy-mde-editor'),
diff --git a/app/components/avo/fields/number_field/edit_component.html.erb b/app/components/avo/fields/number_field/edit_component.html.erb
index 663e76a076..55569a6c1a 100644
--- a/app/components/avo/fields/number_field/edit_component.html.erb
+++ b/app/components/avo/fields/number_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.number_field @field.id,
     value: @field.value,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/number_field/index_component.html.erb b/app/components/avo/fields/number_field/index_component.html.erb
index cd04797d85..e8e24ec470 100644
--- a/app/components/avo/fields/number_field/index_component.html.erb
+++ b/app/components/avo/fields/number_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/number_field/show_component.html.erb b/app/components/avo/fields/number_field/show_component.html.erb
index d7740937a7..de27aa8c7f 100644
--- a/app/components/avo/fields/number_field/show_component.html.erb
+++ b/app/components/avo/fields/number_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/password_field/edit_component.html.erb b/app/components/avo/fields/password_field/edit_component.html.erb
index 5a102a784d..56812e8aab 100644
--- a/app/components/avo/fields/password_field/edit_component.html.erb
+++ b/app/components/avo/fields/password_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="relative" data-controller="<%= @field.revealable ? 'password-visibility' : nil %>">
     <%= @form.password_field @field.id,
       value: @field.value,
diff --git a/app/components/avo/fields/preview_field/index_component.html.erb b/app/components/avo/fields/preview_field/index_component.html.erb
index 217de5008e..c5cece6693 100644
--- a/app/components/avo/fields/preview_field/index_component.html.erb
+++ b/app/components/avo/fields/preview_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, class: 'whitespace-no-wrap w-[1%]', flush: true, center_content: true do %>
+<%= index_field_wrapper(**field_wrapper_args, dash_if_blank: false, class: 'whitespace-no-wrap w-[1%]', flush: true, center_content: true) do %>
   <%= link_to resource_view_path,
     title: t('avo.view_item', item: @resource.name).humanize,
     data: {
diff --git a/app/components/avo/fields/progress_bar_field/edit_component.html.erb b/app/components/avo/fields/progress_bar_field/edit_component.html.erb
index 09e878e737..7f96d69119 100644
--- a/app/components/avo/fields/progress_bar_field/edit_component.html.erb
+++ b/app/components/avo/fields/progress_bar_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {controller: "progress-bar-field"} do %>
     <% if @field.display_value %>
       <div class="text-center text-sm font-semibold w-full leading-none mb-1">
diff --git a/app/components/avo/fields/progress_bar_field/index_component.html.erb b/app/components/avo/fields/progress_bar_field/index_component.html.erb
index a6eb650f3d..eb520c2ffb 100644
--- a/app/components/avo/fields/progress_bar_field/index_component.html.erb
+++ b/app/components/avo/fields/progress_bar_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <%= render Avo::Fields::Common::ProgressBarComponent.new value: @field.value, display_value: @field.display_value, value_suffix: @field.value_suffix, max: @field.max, view: view %>
 <% end %>
diff --git a/app/components/avo/fields/progress_bar_field/show_component.html.erb b/app/components/avo/fields/progress_bar_field/show_component.html.erb
index 1fdb77d233..0d6bf21feb 100644
--- a/app/components/avo/fields/progress_bar_field/show_component.html.erb
+++ b/app/components/avo/fields/progress_bar_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::ProgressBarComponent.new value: @field.value, display_value: @field.display_value, value_suffix: @field.value_suffix, max: @field.max, view: view %>
 <% end %>
diff --git a/app/components/avo/fields/radio_field/edit_component.html.erb b/app/components/avo/fields/radio_field/edit_component.html.erb
index 8e304a1dcf..46224729cb 100644
--- a/app/components/avo/fields/radio_field/edit_component.html.erb
+++ b/app/components/avo/fields/radio_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="flex flex-col gap-2">
     <% @field.options.each do |key, value| %>
       <div>
diff --git a/app/components/avo/fields/radio_field/index_component.html.erb b/app/components/avo/fields/radio_field/index_component.html.erb
index 8d4e9d5fda..c116e067ba 100644
--- a/app/components/avo/fields/radio_field/index_component.html.erb
+++ b/app/components/avo/fields/radio_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%== @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/radio_field/show_component.html.erb b/app/components/avo/fields/radio_field/show_component.html.erb
index de7fe73231..73c1cfd944 100644
--- a/app/components/avo/fields/radio_field/show_component.html.erb
+++ b/app/components/avo/fields/radio_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%== @field.value %>
 <% end %>
diff --git a/app/components/avo/fields/select_field/edit_component.html.erb b/app/components/avo/fields/select_field/edit_component.html.erb
index 6247150377..3234e1c8fc 100644
--- a/app/components/avo/fields/select_field/edit_component.html.erb
+++ b/app/components/avo/fields/select_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.select @field.id, options_for_select(@field.options_for_select, selected: @field.value), {
       include_blank: @field.include_blank
     },
diff --git a/app/components/avo/fields/select_field/index_component.html.erb b/app/components/avo/fields/select_field/index_component.html.erb
index 9e210d46d0..bea771b78d 100644
--- a/app/components/avo/fields/select_field/index_component.html.erb
+++ b/app/components/avo/fields/select_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= @field.label %>
 <% end %>
diff --git a/app/components/avo/fields/select_field/show_component.html.erb b/app/components/avo/fields/select_field/show_component.html.erb
index 5e55c25294..1e187c3f0a 100644
--- a/app/components/avo/fields/select_field/show_component.html.erb
+++ b/app/components/avo/fields/select_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args.merge(dash_if_blank: false) do %>
+<%= field_wrapper(**field_wrapper_args.merge(dash_if_blank: false)) do %>
   <%= @field.value.nil? ? "—" : @field.label %>
 <% end %>
diff --git a/app/components/avo/fields/status_field/edit_component.html.erb b/app/components/avo/fields/status_field/edit_component.html.erb
index f2b39f75cf..5f487234a8 100644
--- a/app/components/avo/fields/status_field/edit_component.html.erb
+++ b/app/components/avo/fields/status_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
diff --git a/app/components/avo/fields/status_field/index_component.html.erb b/app/components/avo/fields/status_field/index_component.html.erb
index 86ba99d9c1..b1f6edcb30 100644
--- a/app/components/avo/fields/status_field/index_component.html.erb
+++ b/app/components/avo/fields/status_field/index_component.html.erb
@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
 <% end %>
diff --git a/app/components/avo/fields/status_field/show_component.html.erb b/app/components/avo/fields/status_field/show_component.html.erb
index 40f09fe854..16b6ebb852 100644
--- a/app/components/avo/fields/status_field/show_component.html.erb
+++ b/app/components/avo/fields/status_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
 <% end %>
diff --git a/app/components/avo/fields/tags_field/edit_component.html.erb b/app/components/avo/fields/tags_field/edit_component.html.erb
index 2228aa1ca9..a798d2ea61 100644
--- a/app/components/avo/fields/tags_field/edit_component.html.erb
+++ b/app/components/avo/fields/tags_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args, data: {
+<%= field_wrapper(**field_wrapper_args, data: {
       controller: "tags-field",
       tags_field_mode_value: @field.mode,
       tags_field_whitelist_items_value: @field.whitelist_items,
@@ -8,7 +8,7 @@
       tags_field_close_on_select_value: @field.close_on_select,
       tags_field_delimiters_value: @field.delimiters,
       tags_field_fetch_values_from_value: @field.fetch_values_from,
-    } do %>
+    }) do %>
     <%# We use a dummy field so the back action from Turbo does not brake the field %>
     <%# dummy field %>
     <%= text_field_tag "#{@field.id}-dummy", '',
diff --git a/app/components/avo/fields/tags_field/index_component.html.erb b/app/components/avo/fields/tags_field/index_component.html.erb
index 481a4f9b83..e92830686c 100644
--- a/app/components/avo/fields/tags_field/index_component.html.erb
+++ b/app/components/avo/fields/tags_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args, flush: true do %>
+<%= index_field_wrapper(**field_wrapper_args, flush: true) do %>
   <div class="flex gap-1 items-center flex-nowrap">
     <% value.take(3).each do |item| %>
       <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>
diff --git a/app/components/avo/fields/tags_field/show_component.html.erb b/app/components/avo/fields/tags_field/show_component.html.erb
index 36f9e9f092..67a8182d60 100644
--- a/app/components/avo/fields/tags_field/show_component.html.erb
+++ b/app/components/avo/fields/tags_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="flex gap-1 items-center flex-wrap">
     <% @field.field_value.each do |item| %>
       <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>
diff --git a/app/components/avo/fields/text_field/edit_component.html.erb b/app/components/avo/fields/text_field/edit_component.html.erb
index 540ee3bd1c..3288d855c8 100644
--- a/app/components/avo/fields/text_field/edit_component.html.erb
+++ b/app/components/avo/fields/text_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= form.text_field @field.id,
     value: @field.value,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/text_field/index_component.html.erb b/app/components/avo/fields/text_field/index_component.html.erb
index 8aef218117..1713022505 100644
--- a/app/components/avo/fields/text_field/index_component.html.erb
+++ b/app/components/avo/fields/text_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
   <% if @field.as_html %>
     <%== @field.value %>
   <% elsif @field.protocol.present? %>
diff --git a/app/components/avo/fields/text_field/show_component.html.erb b/app/components/avo/fields/text_field/show_component.html.erb
index cd802170c7..79ee8b7c70 100644
--- a/app/components/avo/fields/text_field/show_component.html.erb
+++ b/app/components/avo/fields/text_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <% if @field.as_html %>
     <%== @field.value %>
   <% elsif @field.protocol.present? %>
diff --git a/app/components/avo/fields/textarea_field/edit_component.html.erb b/app/components/avo/fields/textarea_field/edit_component.html.erb
index e4d5382164..79096a9e2b 100644
--- a/app/components/avo/fields/textarea_field/edit_component.html.erb
+++ b/app/components/avo/fields/textarea_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= @form.text_area @field.id,
     value: @field.value,
     class: classes("w-full"),
diff --git a/app/components/avo/fields/textarea_field/show_component.html.erb b/app/components/avo/fields/textarea_field/show_component.html.erb
index 16af576b87..0e783261e5 100644
--- a/app/components/avo/fields/textarea_field/show_component.html.erb
+++ b/app/components/avo/fields/textarea_field/show_component.html.erb
@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <div class="whitespace-pre-line"><%= @field.value %></div>
 <% end %>
diff --git a/app/components/avo/fields/time_field/edit_component.html.erb b/app/components/avo/fields/time_field/edit_component.html.erb
index 5fb2fe741f..fa6e670b8a 100644
--- a/app/components/avo/fields/time_field/edit_component.html.erb
+++ b/app/components/avo/fields/time_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, class: "flex relative", data: {
       controller: "date-field",
       date_field_view_value: @view,
diff --git a/app/components/avo/fields/time_field/index_component.html.erb b/app/components/avo/fields/time_field/index_component.html.erb
index 0eb121fab1..b6cda26ad5 100644
--- a/app/components/avo/fields/time_field/index_component.html.erb
+++ b/app/components/avo/fields/time_field/index_component.html.erb
@@ -1,4 +1,4 @@
-<%= index_field_wrapper **field_wrapper_args do %>
+<%= index_field_wrapper(**field_wrapper_args) do %>
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/time_field/show_component.html.erb b/app/components/avo/fields/time_field/show_component.html.erb
index 3d81897829..4dd97bd0e3 100644
--- a/app/components/avo/fields/time_field/show_component.html.erb
+++ b/app/components/avo/fields/time_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
diff --git a/app/components/avo/fields/tiptap_field/edit_component.html.erb b/app/components/avo/fields/tiptap_field/edit_component.html.erb
index c57f3e19d4..e3bd738028 100644
--- a/app/components/avo/fields/tiptap_field/edit_component.html.erb
+++ b/app/components/avo/fields/tiptap_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div,
     class: "tiptap__field",
     data: {
diff --git a/app/components/avo/fields/tiptap_field/show_component.html.erb b/app/components/avo/fields/tiptap_field/show_component.html.erb
index 08d7c50e21..0fe89ae013 100644
--- a/app/components/avo/fields/tiptap_field/show_component.html.erb
+++ b/app/components/avo/fields/tiptap_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%
     content_classes = 'tiptap__content py-2 max-w-4xl'
     content_classes << ' hidden' unless @field.always_show
diff --git a/app/components/avo/fields/trix_field/edit_component.html.erb b/app/components/avo/fields/trix_field/edit_component.html.erb
index 01fdae224e..7318cffc7e 100644
--- a/app/components/avo/fields/trix_field/edit_component.html.erb
+++ b/app/components/avo/fields/trix_field/edit_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%= content_tag :div,
     class: "relative block overflow-x-auto max-w-4xl",
     data: {
diff --git a/app/components/avo/fields/trix_field/show_component.html.erb b/app/components/avo/fields/trix_field/show_component.html.erb
index 4a45444f10..3b053fd740 100644
--- a/app/components/avo/fields/trix_field/show_component.html.erb
+++ b/app/components/avo/fields/trix_field/show_component.html.erb
@@ -1,4 +1,4 @@
-<%= field_wrapper **field_wrapper_args do %>
+<%= field_wrapper(**field_wrapper_args) do %>
   <%
     content_classes = 'trix-content py-2 max-w-4xl'
     content_classes << ' hidden' unless @field.always_show