avo 2.47.0 → 2.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38ab852dd9e98b8a3096344f2fd4e3145e937a2cbbef3524adea0fb7339c6949
-  data.tar.gz: 5140ed4d3a7075d2ed3c539ea87134026b43eba770d0615ad3ffb1694ed9dc77
+  metadata.gz: 63a1e190de1ea81343c769a8896e64c91aab1024084dc04d3b8ed1ce96e55233
+  data.tar.gz: cd447a81f2d123f536fe500ee57c6cd1396df2e5615ae4b8f1d3dfa944ff8214
 SHA512:
-  metadata.gz: 149111feccf530c8da825b8367632a04bb35960e6d9ec3f95c5b2379abcff11a6e1e6e75661c506c9211af56ac4416fe54fb08f0ca9dd849ae934d3e54fa7628
-  data.tar.gz: 5016d7212fa9dac1aa76868e1fa0bd84930e27c4f5e800892c14bc96c1bf5876aca88357bfd77c1a7995300b3aba75dabce0d6d97eafb09090af49e1676e9862
+  metadata.gz: 83f2e5618a4fd689d5619d0c390bf41bae93e73b74b75d30b2cfddc2091eb7770a76704df7a251897910c886d25fefd97e5c4e0de179cb2ac2b93f3a3886855c
+  data.tar.gz: 30ed29798e3563143acf57eb594c915fdaac080b082bf02fb5a72c4073b3eed53256773b17987f17e0cb0a26bc3e257ee77ea45aaed92ac9d3c5e2b10843b8ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.47.0)
+    avo (2.48.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/field_wrapper_component.rb

@@ -82,6 +82,12 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
       **@data
     }
 
+    # 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
+
     # Add the built-in stimulus integration data tags.
     if @resource.present?
       add_stimulus_attributes_for(@resource, attributes)
@@ -91,12 +97,6 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
       add_stimulus_attributes_for(@action, attributes)
     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
 

data/app/components/avo/fields/common/files/view_type/grid_item_component.html.erb

@@ -1,6 +1,6 @@
 <div id="<%= dom_id file %>" class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-2">
   <% if file.present? %>
-    <div class="flex h-full">
+    <div class="flex flex-col h-full">
       <% if file.representable? && is_image? %>
         <%= image_tag helpers.main_app.url_for(file), class: "rounded-lg max-w-full #{@extra_classes}" %>
       <% elsif is_audio? %>

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

@@ -1,5 +1,6 @@
 <%= @form.hidden_field @field.id,
   class: @field.get_html(:classes, view: view, element: :input),
   data: @field.get_html(:data, view: view, element: :input),
-  style: @field.get_html(:style, view: view, element: :input)
+  style: @field.get_html(:style, view: view, element: :input),
+  value: @field.value
 %>

data/lib/avo/services/encryption_service.rb

@@ -32,16 +32,12 @@ module Avo
       private
 
       def encryption_key
-        secret_key_base[0..31]
+        Rails.application.secret_key_base[0..31]
       rescue
         # This will fail the decryption process.
         # It's here only to keep Avo from crashing
         SecureRandom.random_bytes(32)
       end
-
-      def secret_key_base
-        ENV["SECRET_KEY_BASE"] || Rails.application.credentials.secret_key_base || Rails.application.secrets.secret_key_base
-      end
     end
   end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.47.0" unless const_defined?(:VERSION)
+  VERSION = "2.48.0" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.47.0
+  version: 2.48.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord