avo 2.16.0 → 2.16.1.pre.1.nativefields

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= content_tag :div, data: {
       controller: "date-field",
       date_field_view_value: @view,

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

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,

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

@@ -3,15 +3,21 @@
 class Avo::Fields::EditComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
+  attr_reader :compact
+  attr_reader :displayed_in_modal
   attr_reader :field
+  attr_reader :form
+  attr_reader :index
+  attr_reader :resource
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0, form: nil, displayed_in_modal: false)
+  def initialize(field: nil, resource: nil, index: 0, form: nil, displayed_in_modal: false, compact: false, **kwargs)
+    @compact = compact
+    @displayed_in_modal = displayed_in_modal
     @field = field
-    @resource = resource
-    @index = index
     @form = form
-    @displayed_in_modal = displayed_in_modal
+    @index = index
+    @resource = resource
     @view = :edit
   end
 
@@ -22,4 +28,16 @@ class Avo::Fields::EditComponent < ViewComponent::Base
   def render?
     !field.computed
   end
+
+  def field_wrapper_args
+    {
+      compact: compact,
+      displayed_in_modal: displayed_in_modal,
+      field: field,
+      form: form,
+      index: index,
+      resource: resource,
+      view: view
+    }
+  end
 end

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal 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),

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

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, resource: @resource do %>
+<%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <%= image_tag @field.value, style: 'max-width: 340px;' %>
   <% end %>

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <div class="mb-2">
       <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, full_width: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, full_width: true do %>
+<%= field_wrapper  **field_wrapper_args, full_width: true do %>
   <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= render Avo::Fields::Common::GravatarViewerComponent.new(
     md5: @field.md5,
     default: @field.default,

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

@@ -1,3 +1,3 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @field.value %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @field.value %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, full_width: true do %>
-  <%= render Avo::Fields::Common::KeyValueComponent.new field: @field, form: @form, view: @resource.view %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
+  <%= render Avo::Fields::Common::KeyValueComponent.new field: @field, form: @form, view: view %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index, full_width: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <%= render Avo::Fields::Common::KeyValueComponent.new field: @field, view: :show %>
 <% end %>

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

@@ -1,9 +1,9 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, full_width: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <div data-controller="simple-mde">
     <%= @form.text_area @field.id,
       class: classes("w-full js-has-simple-mde-editor"),
       data: {
-        view: @resource.view,
+        view: view,
         'simple-mde-target': 'element',
         'component-options': @field.options.to_json,
       },

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

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index, full_width: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <div data-controller="simple-mde">
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full js-has-simple-mde-editor'),

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @form.number_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @field.value %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @form.password_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <% if @field.display_value %>
     <div class="text-center text-sm font-semibold w-full leading-none mb-1">
       <span class="js-progress-bar-value-<%= @field.id %>"><%= @field.value %></span><%= @field.value_suffix if @field.value_suffix.present? %>

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index 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 %>

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

@@ -1,6 +1,5 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @form.select @field.id, @field.options_for_select, {
-      selected: @field.value,
       include_blank: @field.include_blank
     },
     aria: {

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @field.label %>
 <% end %>

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

@@ -3,12 +3,47 @@
 class Avo::Fields::ShowComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
+  attr_reader :field
+  attr_reader :index
+  attr_reader :resource
   attr_reader :view
 
   def initialize(field: nil, resource: nil, index: 0, form: nil)
     @field = field
-    @resource = resource
     @index = index
+    @resource = resource
     @view = :show
   end
+
+  def wrapper_data
+    {
+      **stimulus_attributes
+    }
+  end
+
+  def stimulus_attributes
+    attributes = {}
+
+    if @resource.present?
+      @resource.get_stimulus_controllers.split(" ").each do |controller|
+        attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
+      end
+    end
+
+    wrapper_data_attributes = @field.get_html :data, view: view, element: :wrapper
+    if wrapper_data_attributes.present?
+      attributes.merge! wrapper_data_attributes
+    end
+
+    attributes
+  end
+
+  def field_wrapper_args
+    {
+      field: field,
+      index: index,
+      resource: resource,
+      view: view
+    }
+  end
 end

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal 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),

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
 <% end %>

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

@@ -1,8 +1,4 @@
-<%= edit_field_wrapper field: @field,
-  index: @index,
-  form: @form,
-  resource: @resource,
-  displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <div data-controller="tags-field">
     <%# dummy field %>
     <%= text_field_tag "#{@field.id}-dummy", '',

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

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index 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)) %>

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

@@ -1,5 +1,5 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <%= @form.text_field @field.id,
+<%= field_wrapper **field_wrapper_args do %>
+  <%= form.text_field @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: @field.is_readonly?,

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

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <% if @field.as_html %>
     <%== @field.value %>
   <% elsif @field.protocol.present? %>

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @form.text_area @field.id,
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%= @field.value %>
 <% end %>

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

@@ -3,8 +3,8 @@
     data: {
       controller: "trix-field",
       trix_field_target: "controller",
-      resource_name: @resource.model_key,
-      resource_id: @resource.model.methods.include?(:id) ? @resource.model&.id : nil,
+      resource_name: resource_name,
+      resource_id: resource_id,
       attachments_disabled: @field.attachments_disabled,
       attachment_key: @field.attachment_key,
       hide_attachment_filename: @field.hide_attachment_filename,

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

@@ -1,7 +1,25 @@
 # frozen_string_literal: true
 
 class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
+  attr_reader :resource
+
+  def initialize(**args)
+    @resource = args[:resource]
+    @resource_id = args[:resource_id]
+    @resource_name = args[:resource_name]
+
+    super(**args)
+  end
+
+  def resource_name
+    @resource_name || resource&.singular_route_key
+  end
+
+  def resource_id
+    @resource_id || resource&.model&.id
+  end
+
   def trix_id
-    "trix_#{@resource.class_name_without_resource.underscore}_#{@field.id}"
+    "trix_#{resource_name}_#{@field.id}"
   end
 end

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

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
+<%= field_wrapper **field_wrapper_args do %>
   <%
     content_classes = 'trix-content py-2'
     content_classes << ' hidden' unless @field.always_show

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

@@ -67,6 +67,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def parent_resource
+    return @parent_resource if @parent_resource.present?
     return nil if @parent_model.blank?
 
     ::Avo::App.get_resource_by_model_name @parent_model.class

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

@@ -15,9 +15,10 @@
     },
     multipart: true do |form| %>
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
-    <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-      <% c.tools do %>
-        <%= a_link back_path,
+    <%= content_tag :div, class: 'space-y-12' do %>
+      <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+        <% c.tools do %>
+          <%= a_link back_path,
         style: :text,
         icon: 'arrow-left' do %>
           <%= t('avo.cancel').capitalize %>
@@ -44,10 +45,10 @@
         <% end %>
         <% if can_see_the_save_button? %>
           <%= a_button color: :primary,
-              style: :primary,
-              loading: true,
-              type: :submit,
-              icon: 'save' do %>
+            style: :primary,
+            loading: true,
+            type: :submit,
+            icon: 'save' do %>
             <%= t('avo.save').capitalize %>
           <% end %>
         <% end %>
@@ -62,35 +63,36 @@
                 .component_for_view(view_for field)
                 .new(field: field, resource: @resource, index: index, form: form)
               %>
-            <% end %>
-          </div>
+              <% end %>
+            </div>
+          <% end %>
         <% end %>
-      <% end %>
-      <% if Avo.configuration.buttons_on_form_footers %>
-        <% c.footer_tools do %>
-          <div class="mt-4">
-            <%= a_link back_path,
+        <% if Avo.configuration.buttons_on_form_footers %>
+          <% c.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,
+                <%= 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 %>
+                  <%= t('avo.save').capitalize %>
+                <% end %>
               <% end %>
-            <% end %>
-          </div>
+            </div>
+          <% end %>
         <% end %>
       <% end %>
-    <% end %>
-    <%= content_tag :div, class: 'space-y-12 mt-12' do %>
-      <% @resource.get_items.each_with_index do |item, index| %>
-        <% next if item.nil? %>
-        <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: @view, form: form %>
+      <%= content_tag :div, class: 'space-y-12' do %>
+        <% @resource.get_items.each_with_index do |item, index| %>
+          <% next if item.nil? %>
+          <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: @view, form: form %>
+        <% end %>
       <% end %>
     <% end %>
   <% end %>

data/app/controllers/avo/application_controller.rb

@@ -16,6 +16,7 @@ module Avo
     before_action :set_default_locale, if: -> { params[:set_locale].present? }
     before_action :init_app
     before_action :check_avo_license
+    before_action :set_resource_name
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -269,7 +270,13 @@ module Avo
     end
 
     def set_authorization
-      @authorization = Services::AuthorizationService.new _current_user
+      # We need to set @resource_name for the #resource method to work properly
+      set_resource_name
+      @authorization = if resource
+        resource.authorization(user: _current_user)
+      else
+        Services::AuthorizationService.new _current_user
+      end
     end
 
     def set_container_classes

data/app/controllers/avo/base_controller.rb

@@ -84,7 +84,7 @@ module Avo
 
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
+        via_resource = Avo::App.get_resource_by_model_name(params[:via_resource_class]).dup
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
@@ -107,7 +107,7 @@ module Avo
       @page_title = @resource.default_panel_name.to_s
 
       if is_associated_record?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
+        via_resource = Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
@@ -139,7 +139,7 @@ module Avo
         # For when working with has_one, has_one_through, has_many_through, has_and_belongs_to_many, polymorphic
         if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
           # find the record
-          via_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
+          via_resource = ::Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
           @related_record = via_resource.model_class.find params[:via_resource_id]
 
           @model.send(params[:via_relation]) << @related_record
@@ -370,7 +370,7 @@ module Avo
       last_crumb_args = {}
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
+        via_resource = Avo::App.get_resource_by_model_name(params[:via_resource_class]).dup
         via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
@@ -413,7 +413,7 @@ module Avo
     def after_create_path
       # If this is an associated record return to the association show page
       if is_associated_record?
-        parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
+        parent_resource = ::Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
 
         return resource_view_path(
           model: @model.send(params[:via_relation]),

data/app/helpers/avo/application_helper.rb

@@ -17,18 +17,18 @@ module Avo
     end
 
     def empty_state(**args)
-      render Avo::EmptyStateComponent.new **args
+      render Avo::EmptyStateComponent.new(**args)
     end
 
     def a_button(**args, &block)
       render Avo::ButtonComponent.new(is_link: false, **args) do
-        capture(&block) if block_given?
+        capture(&block) if block
       end
     end
 
     def a_link(path = nil, **args, &block)
       render Avo::ButtonComponent.new(path, is_link: true, **args) do
-        capture(&block) if block_given?
+        capture(&block) if block
       end
     end
 
@@ -114,5 +114,33 @@ module Avo
 
       output
     end
+
+    def avo_field(type = nil, id = nil, as: nil, view: :show, form: nil, component_options: {}, **args, &block)
+      if as.present?
+        id = type
+        type = as
+      end
+      field_klass = "Avo::Fields::#{type.to_s.camelize}Field".safe_constantize
+      field = field_klass.new id, form: form, view: view, **args, &block
+
+      # Add the form record to the field so all fields have access to it.
+      field.hydrate(model: form.object)
+
+      render field.component_for_view(view).new field: field, form: form, **component_options
+    end
+
+    def avo_show_field(id, type = nil, view: :show, **args, &block)
+      avo_field(id, type, **args, view: view, &block)
+    end
+
+    def avo_edit_field(id, type = nil, view: :edit, **args, &block)
+      avo_field(id, type, **args, view: view, &block)
+    end
+
+    def field_container(**args, &block)
+      classes = args[:class] || ""
+      classes << "flex flex-col divide-y"
+      content_tag :div, **args, class: classes, &block
+    end
   end
 end

data/app/helpers/avo/resources_helper.rb

@@ -20,17 +20,13 @@ module Avo
       end
     end
 
-    def show_field_wrapper(**args, &block)
-      render Show::FieldWrapperComponent.new(**args) do
-        capture(&block)
-      end
-    end
-
-    def edit_field_wrapper(**args, &block)
-      render Edit::FieldWrapperComponent.new(**args) do
+    def field_wrapper(**args, &block)
+      render Avo::FieldWrapperComponent.new(**args) do
         capture(&block)
       end
     end
+    alias :edit_field_wrapper :field_wrapper
+    alias :show_field_wrapper :field_wrapper
 
     def filter_wrapper(name: nil, index: nil, **args, &block)
       render layout: "layouts/avo/filter_wrapper", locals: {

data/app/javascript/js/controllers/action_controller.js

@@ -1,5 +1,5 @@
-import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../helpers/cast_boolean'
+import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
   static targets = ['controllerDiv', 'resourceIds', 'form', 'selectedAllQuery']
@@ -7,6 +7,8 @@ export default class extends Controller {
   connect() {
     this.resourceIdsTarget.value = this.resourceIds
 
+    console.log('something')
+
     // This value is picked up from the DOM so we check true/false as strings
     if (this.selectionOptions.itemSelectAllSelectedAllValue === 'true') {
       this.selectedAllQueryTarget.value = this.selectionOptions.itemSelectAllSelectedAllQueryValue