avo 2.16.0 → 2.16.1.pre.1.nativefields

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca4190d675e166dedf5f47c9c68f3b7fa57e29c9e7510262a4033f1c0cbb00d
-  data.tar.gz: 6f4f3c3f1a39fbb7b9d3566ff679cd3992b684576b1e4c1451b7d4fdd39c173f
+  metadata.gz: 9faaa635bf77fa6bd6267dedf2a72bea08eb21c84714da5614be28df50da9028
+  data.tar.gz: 34418d8586a608efdcaf5b44c4cd98450578c0719e731d3534ac243681d3b994
 SHA512:
-  metadata.gz: c2dfc8a393554111f16a4c95ed94ef1180e9b448327d182071ebef301773e37436db614411121744107bae9252e40a5432d828ebb2661abef2148883e0675c08
-  data.tar.gz: 3914b51410ba770dd7f8a396bddfb6bb1be58d694aebb159f23b3de1e3c841186fa85d62bf0d982ef475a5a07c80bd9f24a4cf41d0b22a874e4df073dc11da25
+  metadata.gz: 638a6f1809a1e379206d0358b8f8cb5767f53b3a8b5db8d61aa175744dd641c5332349d6108eb8565eae26b8629b9744da3549559243a4ced410a1b01cd41296
+  data.tar.gz: 3565f031cabab8fc386cab48276bfeb54592a45d5fdea58c5541935f4ebfed684223fdaf80baf26f5fb321641cb20644660abb70ca15400386dbaf9d9b5ee895

data/Gemfile

@@ -117,8 +117,6 @@ gem "httparty"
 
 gem "iso"
 
-gem "hotwire-rails"
-
 gem "active_link_to"
 
 gem "addressable"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.16.0)
+    avo (2.16.1.pre.1.nativefields)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -9,7 +9,6 @@ PATH
       countries
       docile
       dry-initializer
-      hotwire-rails
       httparty
       image_processing
       inline_svg
@@ -17,6 +16,7 @@ PATH
       pagy
       pundit
       rails (>= 6.0)
+      turbo-rails
       view_component (= 2.60)
       zeitwerk
 
@@ -91,8 +91,8 @@ GEM
       activerecord (>= 6.0, < 7.1)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -103,30 +103,30 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.551.0)
-    aws-sdk-core (3.125.5)
+    aws-partitions (1.621.0)
+    aws-sdk-core (3.134.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.3)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bindex (0.8.1)
-    bootsnap (1.10.3)
+    bootsnap (1.13.0)
       msgpack (~> 1.2)
     breadcrumbs_on_rails (4.1.0)
       railties (>= 5.0)
     builder (3.2.4)
     bump (0.10.0)
-    bundler-integrity (1.0.7)
+    bundler-integrity (1.0.9)
     byebug (11.1.3)
     capybara (3.36.0)
       addressable
@@ -140,13 +140,12 @@ GEM
     chartkick (4.2.1)
     childprocess (4.1.0)
     concurrent-ruby (1.1.10)
-    countries (4.2.1)
-      i18n_data (~> 0.15.0)
+    countries (5.1.2)
       sixarm_ruby_unaccent (~> 1.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    cssbundling-rails (1.0.0)
+    cssbundling-rails (1.1.1)
       railties (>= 6.0.0)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -163,20 +162,20 @@ GEM
     diff-lcs (1.5.0)
     digest (3.1.0)
     docile (1.4.0)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
       railties (>= 3.2)
     dry-initializer (3.1.1)
     erb-formatter (0.3.0)
-    erubi (1.10.0)
-    factory_bot (6.2.0)
+    erubi (1.11.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.19.0)
-      i18n (>= 1.6, < 2)
+    faker (2.22.0)
+      i18n (>= 1.8.11, < 2)
     ffi (1.15.5)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
@@ -186,44 +185,38 @@ GEM
     gem-release (2.2.2)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    groupdate (5.2.4)
-      activesupport (>= 5)
+    groupdate (6.1.0)
+      activesupport (>= 5.2)
     hashdiff (1.0.1)
     hightop (0.3.0)
       activesupport (>= 5.2)
-    hotwire-livereload (1.1.0)
+    hotwire-livereload (1.2.2)
       listen (>= 3.0.0)
       rails (>= 6.0.0)
-    hotwire-rails (0.1.3)
-      rails (>= 6.0.0)
-      stimulus-rails
-      turbo-rails
-    htmlbeautifier (1.4.1)
+    htmlbeautifier (1.4.2)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.15.0)
-      simple_po_parser (~> 1.1)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-wait (0.2.1)
     iso (0.4.0)
       i18n
     jmespath (1.6.1)
-    jsbundling-rails (1.0.0)
+    jsbundling-rails (1.0.3)
       railties (>= 6.0.0)
+    json (2.6.2)
     launchy (2.5.0)
       addressable (~> 2.7)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.18.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -233,7 +226,7 @@ GEM
       zeitwerk
     marcel (1.0.2)
     matrix (0.4.2)
-    meta-tags (2.16.0)
+    meta-tags (2.17.0)
       actionpack (>= 3.2.0, < 7.1)
     method_source (1.0.0)
     mime-types (3.4.1)
@@ -242,29 +235,28 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
-    msgpack (1.4.4)
+    minitest (5.16.3)
+    msgpack (1.5.6)
     multi_xml (0.6.0)
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.7)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.3.1)
-    public_suffix (4.0.6)
-    puma (5.6.4)
+    pg (1.4.3)
+    public_suffix (5.0.0)
+    puma (5.6.5)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
@@ -304,27 +296,27 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    ransack (2.5.0)
-      activerecord (>= 5.2.4)
-      activesupport (>= 5.2.4)
+    ransack (3.2.1)
+      activerecord (>= 6.1.5)
+      activesupport (>= 6.1.5)
       i18n
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.6.0)
-    regexp_parser (2.2.0)
+    redis (4.8.0)
+    regexp_parser (2.5.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-rails (4.0.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
@@ -333,34 +325,35 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.3)
-    rubocop (1.25.0)
+    rspec-support (3.11.0)
+    rubocop (1.35.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-shopify (2.5.0)
-      rubocop (~> 1.25)
+    rubocop-shopify (2.9.0)
+      rubocop (~> 1.33)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    selenium-webdriver (4.1.0)
+    selenium-webdriver (4.4.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
-    simple_po_parser (1.1.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -369,7 +362,7 @@ GEM
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     sixarm_ruby_unaccent (1.2.0)
     spring (4.0.0)
     spring-commands-rspec (1.0.4)
@@ -381,20 +374,19 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    standard (1.7.0)
-      rubocop (= 1.25.0)
-      rubocop-performance (= 1.13.2)
-    stimulus-rails (1.0.2)
-      railties (>= 6.0.0)
-    test-prof (1.0.7)
+    standard (1.16.0)
+      rubocop (= 1.35.0)
+      rubocop-performance (= 1.14.3)
+    test-prof (1.0.10)
     thor (1.2.1)
-    timeout (0.2.0)
-    turbo-rails (1.0.1)
+    timeout (0.3.0)
+    turbo-rails (1.3.0)
       actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     view_component (2.60.0)
       activesupport (>= 5.0.0, < 8.0)
       method_source (~> 1.0)
@@ -409,10 +401,11 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
-    webmock (3.14.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -455,7 +448,6 @@ DEPENDENCIES
   groupdate
   hightop
   hotwire-livereload (~> 1.1)
-  hotwire-rails
   htmlbeautifier
   httparty
   image_processing (~> 1.12)

data/app/components/avo/base_component.rb

@@ -16,9 +16,15 @@ class Avo::BaseComponent < ViewComponent::Base
     nil
   end
 
+  # Fetch the resource and hydrate it with the model
   def relation_resource
     model = params[:via_resource_class] || params[:via_relation_class]
-    ::Avo::App.get_resource_by_model_name model.safe_constantize
+    model_klass = model.safe_constantize
+
+    resource = ::Avo::App.get_resource_by_model_name model_klass
+    model = model_klass.find params[:via_resource_id]
+
+    resource.dup.hydrate model: model
   end
 
   # Get the resource for the resource using the klass attribute so we get the namespace too

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

@@ -0,0 +1,40 @@
+<%= content_tag :div,
+  class: classes,
+  style: style,
+  data: data do %>
+  <div class="h-full pt-4 md:pt-0 md:h-14 flex self-start items-center text-slate-800">
+    <div class="<% if displayed_in_modal %> md:w-48 <% else %> md:w-64 px-6 md:px-6 <% end %> w-48 flex uppercase font-semibold text-gray-500 text-sm" data-slot="label">
+      <% if form.present? %>
+        <%= form.label field.id, label %>
+      <% else %>
+        <%= field.name %>
+      <% end %>
+      <% if on_edit? && field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
+    </div>
+  </div>
+  <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% unless displayed_in_modal %> px-6 <% end %>">
+    <% if on_show? %>
+      <div class="self-center <% if full_width %> w-full <% else %> w-full md:w-8/12 <% end %>" data-slot="value">
+        <% if field.value.blank? and dash_if_blank %>
+          —
+        <% else %>
+          <%= content %>
+        <% end %>
+      </div>
+    <% elsif on_edit? %>
+      <div class="self-center <% if displayed_in_modal or full_width or compact? %> w-full <% else %> w-full md:w-8/12 <% end %>" data-slot="value">
+        <%= content %>
+        <% if record.present? and record.errors.include? field.id %>
+          <div class="text-red-600 mt-2 text-sm"><%= record.errors.full_messages_for(field.id).to_sentence %></div>
+        <% end %>
+        <% if help.present? %>
+          <div class="text-gray-600 mt-2 text-sm"><%== help %></div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+  <% if params[:avo_debug].present? %>
+    <!-- Raw value: -->
+    <!-- <%== field.value.inspect %> -->
+  <% end %>
+<% end %>

data/app/components/avo/field_wrapper_component.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+class Avo::FieldWrapperComponent < ViewComponent::Base
+  # attr_reader :classes
+  attr_reader :dash_if_blank
+  # attr_reader :data
+  attr_reader :displayed_in_modal
+  # attr_reader :help
+  attr_reader :field
+  attr_reader :form
+  attr_reader :full_width
+  # attr_reader :label
+  attr_reader :resource
+  # attr_reader :record
+  # attr_reader :style
+  attr_reader :view
+
+  def initialize(
+    compact: false,
+    dash_if_blank: true,
+    data: {},
+    displayed_in_modal: false,
+    help: nil, # do we really need it?
+    field: nil,
+    form: nil,
+    full_width: false,
+    label: nil, # do we really need it?
+    resource: nil,
+    style: "",
+    view: :show,
+    **args
+  )
+    @args = args
+    @classes = args[:class].present? ? args[:class] : ""
+    @compact = compact
+    @dash_if_blank = dash_if_blank
+    @data = data
+    @displayed_in_modal = displayed_in_modal
+    @help = help
+    @field = field
+    @form = form
+    @full_width = full_width
+    @label = label
+    @resource = resource
+    @style = style
+    @view = view
+  end
+
+  def classes(extra_classes = "")
+    "relative flex flex-col flex-grow pb-2 md:pb-0 leading-tight min-h-14 #{compact? ? "" : "md:flex-row md:items-center"} #{@classes || ""} #{extra_classes || ""} #{@field.get_html(:classes, view: view, element: :wrapper)}"
+  end
+
+  def style
+    "#{@style} #{@field.get_html(:style, view: view, element: :wrapper)}"
+  end
+
+  def label
+    @label || @field.name
+  end
+
+  def on_show?
+    view == :show
+  end
+
+  def on_edit?
+    view == :edit
+  end
+
+  def help
+    @help || @field.help
+  end
+
+  def record
+    resource.present? ? resource.model : nil
+  end
+
+  def data
+    attributes = {
+      field_id: @field.id,
+      field_type: @field.type
+    }
+
+    # Add the built-in stimulus integration data tags.
+    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
+
+    # Fetch the data attributes off the html option
+    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 compact?
+    @compact
+  end
+end

data/app/components/avo/fields/badge_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::BadgeViewerComponent.new value: @field.value, options: @field.options %>
 <% end %>

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

@@ -12,7 +12,7 @@
     data-association="<%= @field.id %>"
     data-association-class="<%= @field&.target_resource&.model_class || nil %>"
   >
-    <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, help: @field.polymorphic_help || ''  do %>
+    <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
       <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [::Avo::App.get_resource_by_model_name(type.to_s).name, type.to_s] },
       {
         value: @field.value,
@@ -40,7 +40,7 @@
         data-belongs-to-field-target="type"
         data-type="<%= type %>"
       >
-        <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, label: ::Avo::App.get_resource_by_model_name(type.to_s).name do %>
+        <%= field_wrapper **field_wrapper_args, label: ::Avo::App.get_resource_by_model_name(type.to_s).name do %>
           <% if @field.searchable %>
             <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
               disabled: disabled,
@@ -79,7 +79,7 @@
     <% end %>
   </div>
 <% else %>
-  <%= 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.searchable %>
       <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
         field: @field,

data/app/components/avo/fields/belongs_to_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 %>
   <%= link_to @field.label, resource_view_path %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, dash_if_blank: false, displayed_in_modal: @displayed_in_modal do %>
+<%= field_wrapper **field_wrapper_args, dash_if_blank: false do %>
   <div class="h-8 flex items-center">
     <%= @form.check_box @field.id,
       checked: @field.value,

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

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, resource: @resource, index: @index, dash_if_blank: false do %>
+<%= field_wrapper  **field_wrapper_args, dash_if_blank: false do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

data/app/components/avo/fields/boolean_group_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 %>
   <div class="flex items-center">
     <div class="space-y-2">
       <% model_param_key = model_name_from_record_or_class(@resource.model).param_key %>

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

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

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

@@ -1,10 +1,10 @@
-<%= 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="code-field">
     <%= @form.text_area @field.id,
       class: classes("w-full"),
       data: {
         'code-field-target': 'element',
-        view: @resource.view,
+        view: view,
         language: @field.language,
         theme: @field.theme,
         'tab-size': @field.tab_size,

data/app/components/avo/fields/code_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="code-field" style="--height: <%= @field.height %>">
     <%= text_area_tag @field.id, @field.value,
       class: helpers.input_classes('w-full'),
@@ -6,7 +6,7 @@
       disabled: true,
       data: {
         'code-field-target': 'element',
-        view: @resource.view,
+        view: view,
         language: @field.language,
         theme: @field.theme,
         'tab-size': @field.tab_size,

data/app/components/avo/fields/country_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.select @field.id, @field.select_options, {
       selected: @field.value,
       include_blank: @field.include_blank

data/app/components/avo/fields/country_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.display_code %>
     <%= @field.value %>
   <% else %>

data/app/components/avo/fields/date_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_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,