avo 2.17.1.pre.1.zeitwerk.eager.load.dir → 2.17.1.pre.3

data/lib/avo/dynamic_router.rb

@@ -1,25 +1,21 @@
 module Avo
-  class DynamicRouter
-    def self.routes
-      Avo::Engine.routes.draw do
-        scope "resources", as: "resources" do
-          Avo::App.eager_load_resources
+  module DynamicRouter
+    def self.routes(router)
+      Rails.application.eager_load! unless Rails.env.production?
 
-          BaseResource.descendants
-            .select do |resource|
-              resource != :BaseResource
-            end
-            .select do |resource|
-              resource.is_a? Class
-            end
-            # .select do |resource|
-            #   resource.model_class.present?
-            # end
-            .map do |resource|
-              resources resource.new.route_key
-            end
+      BaseResource.descendants
+        .select do |resource|
+          resource != :BaseResource
+        end
+        .select do |resource|
+          resource.is_a? Class
+        end
+        # .select do |resource|
+        #   resource.model_class.present?
+        # end
+        .map do |resource|
+          router.resources resource.new.route_key
         end
-      end
     end
   end
 end

data/lib/avo/engine.rb

@@ -17,15 +17,6 @@ module Avo
       ::Avo::App.boot
     end
 
-    # initializer "eager load resources" do |app|
-    #   # puts ["app.root->", app.root.join('app', 'avo', 'resources')].inspect
-    #   app.config.to_prepare do
-    #     puts ["app.config.to_prepare->", app.root.join('app', 'avo', 'resources')].inspect
-    #     Rails.autoloaders.main.eager_load_dir(app.root.join('app', 'avo', 'resources'))
-    #     puts [".to_prepare BaseResource.descendants->", BaseResource.descendants].inspect
-    #   end
-    # end
-
     initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],

data/lib/avo/fields/base_field.rb

@@ -162,7 +162,7 @@ module Avo
         property ||= id
 
         # Get model value
-        final_value = @model.send(property) if (model_or_class(@model) == "model") && @model.respond_to?(property)
+        final_value = @model.send(property) if is_model?(@model) && @model.respond_to?(property)
 
         # On new views and actions modals we need to prefill the fields
         if @view.in?([:new, :create]) || @action.present?
@@ -263,6 +263,10 @@ module Avo
           "model"
         end
       end
+
+      def is_model?(model)
+        model_or_class(model) == "model"
+      end
     end
   end
 end

data/lib/avo/fields/date_field.rb

@@ -5,6 +5,7 @@ module Avo
       attr_reader :picker_format
       attr_reader :disable_mobile
       attr_reader :format
+      attr_reader :picker_options
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -13,6 +14,7 @@ module Avo
         add_string_prop args, :picker_format, "Y-m-d"
         add_string_prop args, :format, "yyyy-LL-dd"
         add_boolean_prop args, :disable_mobile
+        add_object_prop args, :picker_options
       end
 
       def formatted_value

data/lib/avo/fields/time_field.rb

@@ -0,0 +1,55 @@
+module Avo
+  module Fields
+    class TimeField < DateField
+      attr_reader :format
+      attr_reader :picker_format
+      attr_reader :time_24hr
+      attr_reader :timezone
+      attr_reader :relative
+
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
+
+        add_boolean_prop args, :time_24hr
+        add_string_prop args, :picker_format, "H:i:S"
+        add_string_prop args, :format, "TT"
+        add_string_prop args, :timezone
+        add_boolean_prop args, :relative, true
+      end
+
+      def formatted_value
+        return nil if value.nil?
+
+        value.utc.to_time.iso8601
+      end
+
+      def edit_formatted_value
+        return nil if value.nil?
+
+        value.utc.iso8601
+      end
+
+      def fill_field(model, key, value, params)
+        if value.in?(["", nil])
+          model[id] = value
+
+          return model
+        end
+
+        return model if value.blank?
+
+        model[id] = utc_time(value)
+
+        model
+      end
+
+      def utc_time(value)
+        if timezone.present?
+          ActiveSupport::TimeZone.new(timezone).local_to_utc(Time.parse(value))
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.17.1.pre.1.zeitwerk.eager.load.dir" unless const_defined?(:VERSION)
+  VERSION = "2.17.1.pre.3" unless const_defined?(:VERSION)
 end