avo 2.47.0 → 2.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38ab852dd9e98b8a3096344f2fd4e3145e937a2cbbef3524adea0fb7339c6949
-  data.tar.gz: 5140ed4d3a7075d2ed3c539ea87134026b43eba770d0615ad3ffb1694ed9dc77
+  metadata.gz: 90b4bd0f7e6b9826427c149aa77090a5c5a3ed37818c9c53c55b36eed32500cd
+  data.tar.gz: b65a1cd540a5e130cca20d19fe6d064dba6788b95789551f5f12487c466504b9
 SHA512:
-  metadata.gz: 149111feccf530c8da825b8367632a04bb35960e6d9ec3f95c5b2379abcff11a6e1e6e75661c506c9211af56ac4416fe54fb08f0ca9dd849ae934d3e54fa7628
-  data.tar.gz: 5016d7212fa9dac1aa76868e1fa0bd84930e27c4f5e800892c14bc96c1bf5876aca88357bfd77c1a7995300b3aba75dabce0d6d97eafb09090af49e1676e9862
+  metadata.gz: b362eb0a92f9be0d53e2ba6cb8117b56726cce1495346793c26ea1ac05f2db65a7e1fee842316f9608c20113dcb9e5eaba40d7899c8e86f0fe9d3f18d7cadd2f
+  data.tar.gz: 5fa3e7fb6e9ff428cdac5250b6ecb31e459a297b007be70c7614bd67c9fcd725fbb56d4715d1b63e788b845a261eb48b4f89f8d55f3612895c4746c4f50d983b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.47.0)
+    avo (2.49.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,8 +1,8 @@
 <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}" %>
+        <%= image_tag helpers.main_app.url_for(file), class: "rounded-lg max-w-full self-start #{@extra_classes}" %>
       <% elsif is_audio? %>
         <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
       <% elsif is_video? %>

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/app/javascript/js/controllers/fields/date_field_controller.js

@@ -204,18 +204,22 @@ export default class extends Controller {
       return
     }
 
+    const timezonedDate = DateTime.fromISO(selectedDates[0].toISOString())
+      .setZone(this.displayTimezone, { keepLocalTime: true })
+      .setZone('UTC', { keepLocalTime: !this.relativeValue })
+
     let value
     switch (this.fieldTypeValue) {
       case 'time':
         // For time values, we should maintain the real value and format it to a time-friendly format.
-        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: !this.relativeValue }).toFormat(RAW_TIME_FORMAT)
+        value = timezonedDate.toFormat(RAW_TIME_FORMAT)
         break
       case 'date':
-        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: true }).toFormat(RAW_DATE_FORMAT)
+        value = timezonedDate.toFormat(RAW_DATE_FORMAT)
         break
       default:
       case 'dateTime':
-        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: !this.relativeValue }).toISO()
+        value = timezonedDate.toISO()
         break
     }
 

data/avo.gemspec

@@ -7,12 +7,13 @@ require "avo/version"
 Gem::Specification.new do |spec|
   spec.name = "avo"
   spec.version = Avo::VERSION
-  spec.authors = ["Adrian Marin", "Mihai Marin"]
+  spec.authors = ["Adrian Marin", "Mihai Marin", "Paul Bob"]
   spec.email = ["avo@avohq.io"]
   spec.homepage = "https://avohq.io"
-  spec.summary = "Configuration-based, no-maintenance, extendable Ruby on Rails admin panel framework."
-  spec.description = "Avo abstracts away the common parts of building apps, letting your engineers work on your app's essential components. The result is a full-featured admin panel that works out of the box, ready to give to your end-users."
-  spec.license = "Commercial"
+  spec.summary = "Admin panel framework and Content Management System for Ruby on Rails."
+  spec.description = "Avo is a very custom Content Management System for Ruby on Rails that saves engineers and teams months of development time by building user interfaces and logic using configuration rather than traditional coding; When configuration is not enough, you can fallback to familiar Ruby on Rails code."
+  spec.license = "LGPL-3.0"
+  spec.licenses = ["LGPL-3.0", "Commercial"]
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.

data/lib/avo/fields/date_time_field.rb

@@ -43,19 +43,26 @@ module Avo
       end
 
       def utc_time(value)
-        if timezone.present?
-          ActiveSupport::TimeZone.new(timezone).local_to_utc(Time.parse(value))
+        time = Time.parse(value)
+
+        if timezone.present? && !time.utc?
+          ActiveSupport::TimeZone.new(timezone).local_to_utc(time)
         else
           value
         end
       end
 
       def timezone
-        if @timezone.respond_to?(:call)
+        timezone = if @timezone.respond_to?(:call)
           return Avo::Hosts::ResourceViewRecordHost.new(block: @timezone, record: resource.model, resource: resource, view: view).handle
+        else
+          @timezone
         end
 
-        @timezone
+        # Fix for https://github.com/moment/luxon/issues/1358#issuecomment-2017477897
+        return "Etc/UTC" if timezone&.downcase == "utc" && view.in?([:new, :create, :edit, :update])
+
+        timezone
       end
     end
   end

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.49.0" unless const_defined?(:VERSION)
 end