avo 2.13.3.pre.2 → 2.13.4.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d34394e93a3febeaf9ebc872f0282434b064d5a864e44f508674ff8e02ef3039
-  data.tar.gz: a0aaf952887563612ae4918081ca77a547cd7d47f683db0280154a3850675445
+  metadata.gz: 6cfce3adc5884d591b4c562245c6111e3844f3b71ba028015b9fb02f2890b77b
+  data.tar.gz: 02e2bb8248bf0232c68a596388d4f8be956be9b97c5c114cab27c6f9c5b85d56
 SHA512:
-  metadata.gz: b8a8f86f81575cc8fe3a0a6066608b886dc3d809525e41fc785ea2ef95a7a8ce3f38be558779c5f45824c4791fcedd77ea7959b5513c8bfd71e95206f8bb422e
-  data.tar.gz: 29a4cf34342c519d9b1d84f5c373b9f4a59e962ac558f2d0f1d98f0e716c0376b55fda6766c2a24ed9f03e5913ef32991fd3dd5cd62b3af7bc5e85210120967c
+  metadata.gz: d073957e4ffe0426fbc7583b0a19f1ac2c140ee20c4a2bc418e50a51c6e677a3550d6b4011e4d502f3be564bc4b5f41d742077e145c4ce8bc2700291b402be3b
+  data.tar.gz: 2041ac955eecbe269a27fd3edd515e09d45d21351d59697d30629d24eebdc18fac02467d5b91dcf2157994e46dd0a4e561cba4191696e0ca0c6950ac6d6733fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.13.3.pre.2)
+    avo (2.13.4.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -256,6 +256,8 @@ GEM
     nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.7-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport

data/app/helpers/avo/application_helper.rb

@@ -64,9 +64,15 @@ module Avo
       classes
     end
 
-    # Just use inline_svg gem.
+    # Use inline_svg gem but with our own finder implementation.
     def svg(file_name, **args)
-      inline_svg_tag file_name, **args
+      return if file_name.blank?
+
+      file_name = "#{file_name}.svg" unless file_name.end_with? ".svg"
+
+      with_asset_finder(::Avo::SvgFinder) do
+        inline_svg file_name, **args
+      end
     end
 
     def input_classes(extra_classes = "", has_error: false)
@@ -96,5 +102,17 @@ module Avo
     rescue
       Avo.configuration.root_path
     end
+
+    private
+
+    # Taken from the original library
+    # https://github.com/jamesmartin/inline_svg/blob/main/lib/inline_svg/action_view/helpers.rb#L76
+    def with_asset_finder(asset_finder)
+      Thread.current[:inline_svg_asset_finder] = asset_finder
+      output = yield
+      Thread.current[:inline_svg_asset_finder] = nil
+
+      output
+    end
   end
 end

data/app/javascript/js/controllers/fields/date_field_controller.js

@@ -117,7 +117,11 @@ export default class extends Controller {
 
     flatpickr(this.fakeInputTarget, options)
 
-    this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())
+    if (this.enableTimeValue) {
+      this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())
+    } else {
+      this.updateRealInput(universalTimestamp(this.initialValue))
+    }
   }
 
   onChange(selectedDates) {

data/app/views/layouts/avo/application.html.erb

@@ -33,7 +33,6 @@
             <div class="content p-4 lg:p-6 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
               <%= render partial: "avo/partials/custom_tools_alert" %>
               <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
-              <!-- <%= ::Rails.application.assets_manifest.inspect %> -->
                 <%= yield %>
                 <%= render partial: "avo/partials/footer" %>
               </div>

data/lib/avo/engine.rb

@@ -53,9 +53,6 @@ module Avo
       # app.config.logger = ::Logger.new(STDOUT)
     end
 
-    # Add the outline heroicons to the path
-    config.assets.paths << Avo::Engine.root.join("app", "assets", "svgs", "heroicons", "outline")
-
     config.app_middleware.use(
       Rack::Static,
       urls: ["/avo-assets"],

data/lib/avo/svg_finder.rb

@@ -0,0 +1,45 @@
+class Avo::SvgFinder
+  def self.find_asset(filename)
+    new(filename)
+  end
+
+  def initialize(filename)
+    @filename = filename
+  end
+
+  # Use the default static finder logic. If that doesn't find anything, search according to our pattern:
+  def pathname
+    found_asset = default_strategy
+
+    # Use the found asset
+    return found_asset if found_asset.present?
+
+    paths = [
+      Rails.root.join("app", "assets", "svgs", @filename).to_s,
+      Rails.root.join(@filename).to_s,
+      Avo::Engine.root.join("app", "assets", "svgs", @filename).to_s,
+      Avo::Engine.root.join("app", "assets", "svgs", "heroicons", "outline", @filename).to_s,
+      Avo::Engine.root.join(@filename).to_s,
+    ]
+
+    path = paths.find do |path|
+      File.exist? path
+    end
+
+    path
+  end
+
+  def default_strategy
+    if ::Rails.application.config.assets.compile
+      asset = ::Rails.application.assets[@filename]
+      Pathname.new(asset.filename) if asset.present?
+    else
+      manifest = ::Rails.application.assets_manifest
+      asset_path = manifest.assets[@filename]
+      unless asset_path.nil?
+        ::Rails.root.join(manifest.directory, asset_path)
+      end
+    end
+  end
+end
+

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.13.3.pre.2" unless const_defined?(:VERSION)
+  VERSION = "2.13.4.pre.1" unless const_defined?(:VERSION)
 end