avo 3.0.0.pre12 → 3.0.0.pre15

data/lib/avo/concerns/has_item_type.rb

@@ -33,6 +33,10 @@ module Avo
       def is_sidebar?
         self.class.ancestors.include?(Avo::Resources::Items::Sidebar)
       end
+
+      def is_row?
+        self.class.respond_to?(:item_type) && self.class.item_type == :row
+      end
     end
   end
 end

data/lib/avo/concerns/has_items.rb

@@ -4,34 +4,38 @@ module Avo
       extend ActiveSupport::Concern
 
       class_methods do
-        def deprecated_dsl_api(name = nil)
-          message = "This API was deprecated. Please use the `#{name}` method inside the `fields` method."
+        def deprecated_dsl_api(name, method)
+          message = "This API was deprecated. Please use the `#{name}` method inside the `#{method}` method."
           raise DeprecatedAPIError.new message
         end
 
         # DSL methods
         def field(name, as: :text, **args, &block)
-          deprecated_dsl_api "field"
+          deprecated_dsl_api __method__, "fields"
         end
 
         def panel(name = nil, **args, &block)
-          deprecated_dsl_api "panel"
+          deprecated_dsl_api __method__, "fields"
+        end
+
+        def row(**args, &block)
+          deprecated_dsl_api __method__, "fields"
         end
 
         def tabs(**args, &block)
-          deprecated_dsl_api "tabs"
+          deprecated_dsl_api __method__, "fields"
         end
 
         def tool(klass, **args)
-          deprecated_dsl_api "tool"
+          deprecated_dsl_api __method__, "fields"
         end
 
         def heading(body, **args)
-          deprecated_dsl_api "heading"
+          deprecated_dsl_api __method__, "fields"
         end
 
         def sidebar(**args, &block)
-          deprecated_dsl_api "sidebar"
+          deprecated_dsl_api __method__, "fields"
         end
         # END DSL methods
       end
@@ -42,6 +46,7 @@ module Avo
 
       delegate :field, to: :items_holder
       delegate :panel, to: :items_holder
+      delegate :row, to: :items_holder
       delegate :tabs, to: :items_holder
       delegate :tool, to: :items_holder
       delegate :heading, to: :items_holder
@@ -96,6 +101,10 @@ module Avo
           if item.is_field?
             fields << item
           end
+
+          if item.is_row?
+            fields << extract_fields_from_items(tab)
+          end
         end
 
         fields.flatten
@@ -213,8 +222,10 @@ module Avo
         panelfull_items.grep(Avo::Resources::Items::TabGroup).each do |tab_group|
           tab_group.items.grep(Avo::Resources::Items::Tab).each do |tab|
             tab.items.grep(Avo::Resources::Items::Panel).each do |panel|
-              panel.items.grep(Avo::Fields::BelongsToField).each do |field|
-                field.target = :_top
+              set_target_to_top panel.items.grep(Avo::Fields::BelongsToField)
+
+              panel.items.grep(Avo::Resources::Items::Row).each do |row|
+                set_target_to_top row.items.grep(Avo::Fields::BelongsToField)
               end
             end
           end
@@ -250,9 +261,6 @@ module Avo
 
             item
           end
-          .select do |item|
-            item.visible_in_view?(view: view)
-          end
           .select do |item|
             item.visible?
           end
@@ -264,7 +272,8 @@ module Avo
             end
           end
           .select do |item|
-            if !item.is_heading? && view.in?([:edit, :update, :new, :create])
+            # On location field we can have field coordinates and setters with different names like latitude and longitude
+            if !item.is_a?(Avo::Fields::LocationField) && !item.is_heading? && view.in?([:edit, :update, :new, :create])
               if item.respond_to?(:id)
                 item.resource.record.respond_to?("#{item.id}=")
               else
@@ -290,25 +299,21 @@ module Avo
         visible_items.blank?
       end
 
-      def hydrate(**args)
-        super(**args)
+      private
 
-        items_holder.items.each do |item|
-          item.hydrate(**args)
+      def set_target_to_top(fields)
+        fields.each do |field|
+          field.target = :_top
         end
-
-        self
       end
 
-      private
-
       def extract_fields_from_items(thing)
         fields = []
 
         thing.items.each do |item|
           if item.is_field?
             fields << item
-          elsif item.is_panel?
+          elsif item.is_panel? || item.is_row?
             fields << extract_fields_from_items(item)
           end
         end

data/lib/avo/concerns/model_class_constantized.rb

@@ -4,8 +4,6 @@ module Avo
       extend ActiveSupport::Concern
 
       class_methods do
-        attr_reader :model_class
-
         # Cast the model class to a constantized version and memoize it like that
         def model_class=(value)
           @model_class = case value

data/lib/avo/configuration.rb

@@ -2,8 +2,9 @@ module Avo
   class Configuration
     include ResourceConfiguration
 
+    attr_writer :app_name
+    attr_writer :branding
     attr_writer :root_path
-    attr_accessor :app_name
     attr_accessor :timezone
     attr_accessor :per_page
     attr_accessor :per_page_steps
@@ -42,7 +43,6 @@ module Avo
     attr_accessor :sign_out_path_name
     attr_accessor :resources
     attr_accessor :prefix_path
-    attr_writer :branding
 
     def initialize
       @root_path = "/avo"
@@ -136,6 +136,10 @@ module Avo
     def branding
       Avo::Configuration::Branding.new(**@branding || {})
     end
+
+    def app_name
+      Avo::ExecutionContext.new(target: @app_name).handle
+    end
   end
 
   def self.configuration

data/lib/avo/current.rb

@@ -1,12 +1,39 @@
 class Avo::Current < ActiveSupport::CurrentAttributes
+  # if Rails.env.development?
+  # singleton_class.attr_accessor :previous_attributes
+  # before_reset {
+  #   puts ["before_reset->", self.previous_attributes].inspect
+  #   if attributes.present?
+  #     puts ["has attributes->"].inspect
+  #     self.previous_attributes = attributes
+  #   end
+  #   puts ["before_reset->", self.previous_attributes].inspect
+  # }
+
+  # attr_accessor :previous_attributes
+
+  # def previous_attributes=(value)
+  #   @previous_attributes = value
+  # end
+  # end
+
   attribute :app
   attribute :license
-  attribute :context, :current_user, :view_context
+  attribute :context, :user, :view_context
+  attribute :error_manager
+  attribute :resource_manager
+  attribute :tool_manager
+  attribute :plugin_manager
 
-  delegate :request, to: :view_context
   delegate :params, to: :request
 
   def request
     view_context.request || ActionDispatch::Request.empty
   end
+
+  def current_user
+    Rails.logger.warn "DEPRECATION WARNING: Avo::Current.current_user become deprecated and will become obsolete on futhure versions. Please use Avo::Current.user instead."
+
+    user
+  end
 end

data/lib/avo/dsl/field_parser.rb

@@ -72,7 +72,7 @@ module Avo
       end
 
       def field_class_from_symbol(symbol)
-        matched_field = Avo::App.fields.all.find do |field|
+        matched_field = Avo.field_manager.all.find do |field|
           field[:name].to_s == symbol.to_s
         end
 

data/lib/avo/dynamic_router.rb

@@ -1,12 +1,23 @@
 module Avo
   class DynamicRouter
+    def self.eager_load(entity)
+      paths = Avo::ENTITIES.fetch entity
+
+      return unless paths.present?
+
+      pathname = Rails.root.join(*paths)
+      if pathname.directory?
+        Rails.autoloaders.main.eager_load_dir(pathname.to_s)
+      end
+    end
+
     def self.routes
       Avo::Engine.routes.draw do
         scope "resources", as: "resources" do
           # Check if the user chose to manually register the resource files.
           # If so, eager_load the resources dir.
           if Avo.configuration.resources.nil?
-            Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
+            Avo::DynamicRouter.eager_load(:resources) unless Rails.application.config.eager_load
           end
 
           Avo::Resources::ResourceManager.fetch_resources

data/lib/avo/engine.rb

@@ -3,6 +3,8 @@ Gem.loaded_specs["avo"].dependencies.each do |d|
   case d.name
   when "activerecord"
     require "active_record/railtie"
+  when "activesupport"
+    require "active_support/railtie"
   when "actionview"
     require "action_view/railtie"
   when "activestorage"
@@ -23,7 +25,7 @@ module Avo
       ::Avo.asset_manager.reset
 
       # Boot Avo
-      ::Avo::App.boot
+      ::Avo.boot
 
       # After deploy we want to make sure the license response is being cleared.
       # We need a fresh license response.
@@ -40,7 +42,7 @@ module Avo
     # Ensure we reboot the app when something changes
     config.to_prepare do
       # Boot Avo
-      ::Avo::App.boot
+      ::Avo.boot
     end
 
     initializer "avo.autoload" do |app|
@@ -55,10 +57,6 @@ module Avo
       end
     end
 
-    initializer "avo.init_fields" do |app|
-      ::Avo::App.init_fields
-    end
-
     initializer "avo.reloader" do |app|
       Avo::Reloader.new.tap do |reloader|
         reloader.execute
@@ -91,5 +89,9 @@ module Avo
       Rails::Generators.configure! app.config.generators
       require_relative "../generators/model_generator"
     end
+
+    initializer "avo.locales" do |app|
+      I18n.load_path += Dir[Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "*.{rb,yml}")]
+    end
   end
 end

data/lib/avo/execution_context.rb

@@ -20,7 +20,7 @@ module Avo
 
       # Set defaults on not initialized accessors
       @context ||= Avo::Current.context
-      @current_user ||= Avo::Current.current_user
+      @current_user ||= Avo::Current.user
       @params ||= Avo::Current.params
       @request ||= Avo::Current.request
       @view_context ||= Avo::Current.view_context

data/lib/avo/fields/base_field.rb

@@ -36,9 +36,7 @@ module Avo
       attr_reader :autocomplete
       attr_reader :help
       attr_reader :default
-      attr_reader :as_label
       attr_reader :as_avatar
-      attr_reader :as_description
       attr_reader :stacked
       attr_reader :for_presentation_only
 
@@ -67,14 +65,13 @@ module Avo
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]
         @format_using = args[:format_using] || nil
+        @update_using = args[:update_using] || nil
         @placeholder = args[:placeholder]
         @autocomplete = args[:autocomplete] || nil
         @help = args[:help] || nil
         @default = args[:default] || nil
         @visible = args[:visible]
-        @as_label = args[:as_label] || false
         @as_avatar = args[:as_avatar] || false
-        @as_description = args[:as_description] || false
         @html = args[:html] || nil
         @view = args[:view] || nil
         @value = args[:value] || nil
@@ -174,8 +171,8 @@ module Avo
             target: format_using,
             value: final_value,
             record: record,
-            resource: @resource,
-            view: @view,
+            resource: resource,
+            view: view,
             field: self,
             include: self.class.included_modules
           ).handle
@@ -184,10 +181,22 @@ module Avo
         final_value
       end
 
+      # Fills the record with the received value on create and update actions.
       def fill_field(record, key, value, params)
         return record unless record.methods.include? key.to_sym
 
-        record.send("#{key}=", value)
+        if @update_using.present?
+          value = Avo::ExecutionContext.new(
+            target: @update_using,
+            record: record,
+            key: key,
+            value: value,
+            resource: resource,
+            field: self
+          ).handle
+        end
+
+        record.public_send("#{key}=", value)
 
         record
       end
@@ -268,6 +277,15 @@ module Avo
         !is_disabled? && visible?
       end
 
+      # Used by Avo to fill the record with the default value on :new and :edit views
+      def assign_value(record:, value:)
+        id = type == "belongs_to" ? foreign_key : database_id
+
+        if record.send(id).nil?
+          record.send("#{id}=", value)
+        end
+      end
+
       private
 
       def model_or_class(model)

data/lib/avo/fields/belongs_to_field.rb

@@ -104,9 +104,7 @@ module Avo
 
       # What the user sees in the text field
       def field_label
-        value.send(target_resource.class.title)
-      rescue
-        nil
+        label
       end
 
       def options
@@ -115,16 +113,16 @@ module Avo
 
       def values_for_type(model = nil)
         resource = target_resource
-        resource = Avo::App.resources.get_resource_by_model_class model if model.present?
+        resource = Avo.resource_manager.get_resource_by_model_class model if model.present?
 
-        query = resource.class.query_scope
+        query = resource.query_scope
 
         if attach_scope.present?
           query = Avo::ExecutionContext.new(target: attach_scope, query: query, parent: get_model).handle
         end
 
-        query.all.map do |model|
-          [model.send(resource.class.title), model.id]
+        query.all.map do |record|
+          [resource.new(record: record).record_title, record.id]
         end
       end
 
@@ -182,7 +180,8 @@ module Avo
       end
 
       def label
-        value.send(target_resource.class.title)
+        return if target_resource.blank?
+        target_resource.new(record: value)&.record_title
       end
 
       def to_permitted_param
@@ -197,10 +196,12 @@ module Avo
         return model unless model.methods.include? key.to_sym
 
         if polymorphic_as.present?
-          model.send("#{polymorphic_as}_type=", params["#{polymorphic_as}_type"])
+          valid_model_class = valid_polymorphic_class params["#{polymorphic_as}_type"]
+
+          model.send("#{polymorphic_as}_type=", valid_model_class)
 
           # If the type is blank, reset the id too.
-          if params["#{polymorphic_as}_type"].blank?
+          if valid_model_class.blank?
             model.send("#{polymorphic_as}_id=", nil)
           else
             model.send("#{polymorphic_as}_id=", params["#{polymorphic_as}_id"])
@@ -212,6 +213,12 @@ module Avo
         model
       end
 
+      def valid_polymorphic_class(possible_class)
+        types.find do |type|
+          type.to_s == possible_class.to_s
+        end
+      end
+
       def database_id
         # If the field is a polymorphic value, return the polymorphic_type as key and pre-fill the _id in fill_field.
         return "#{polymorphic_as}_type" if polymorphic_as.present?
@@ -226,7 +233,7 @@ module Avo
 
         if is_polymorphic?
           if value.present?
-            return Avo::App.resources.get_resource_by_model_class(value.class)
+            return Avo.resource_manager.get_resource_by_model_class(value.class)
           else
             return nil
           end
@@ -235,9 +242,9 @@ module Avo
         reflection_key = polymorphic_as || id
 
         if @record._reflections[reflection_key.to_s].klass.present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
         elsif @record._reflections[reflection_key.to_s].options[:class_name].present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
         else
           App.get_resource_by_name reflection_key.to_s
         end

data/lib/avo/fields/concerns/is_searchable.rb

@@ -5,7 +5,7 @@ module Avo
         extend ActiveSupport::Concern
 
         def is_searchable?
-          defined?(AvoPro) && @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
+          defined?(Avo::Pro) && @searchable && Avo.license.has_with_trial(:searchable_associations)
         end
       end
     end

data/lib/avo/fields/concerns/use_resource.rb

@@ -5,7 +5,7 @@ module Avo
         extend ActiveSupport::Concern
 
         def use_resource
-          Avo::App.resources.get_resource @use_resource
+          Avo.resource_manager.get_resource @use_resource
         rescue
           # On boot we eager load the resources before the app is set.
           # Because of that, we don't have a resource manager.

data/lib/avo/fields/field_manager.rb

@@ -11,12 +11,22 @@ module Avo
 
       attr_reader :fields
 
-      alias_method :all, :fields
-
       def initialize
         @fields = []
       end
 
+      def all
+        fields
+          .map do |field|
+            field[:name] = field[:name].to_s
+
+            field
+          end
+          .uniq do |field|
+            field[:name]
+          end
+      end
+
       # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
       # so later we can instantiate them on our resources.
       #
@@ -36,7 +46,7 @@ module Avo
 
       def load_field(method_name, klass)
         fields.push(
-          name: method_name,
+          name: method_name.to_s,
           class: klass
         )
       end

data/lib/avo/fields/has_base_field.rb

@@ -27,7 +27,7 @@ module Avo
       end
 
       def field_resource
-        resource || Avo::App.resources.get_resource_by_model_class(@record.class)
+        resource || Avo.resource_manager.get_resource_by_model_class(@record.class)
       end
 
       def turbo_frame
@@ -50,18 +50,18 @@ module Avo
 
       # What the user sees in the text field
       def field_label
-        value.send(target_resource.class.title)
+        target_resource.hydrate(record: value).record_title
       rescue
         nil
       end
 
       def target_resource
         if @record._reflections[id.to_s].klass.present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
         elsif @record._reflections[id.to_s].options[:class_name].present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
         else
-          Avo::App.resources.get_resource_by_name id.to_s
+          Avo.resource_manager.get_resource_by_name id.to_s
         end
       end
 

data/lib/avo/fields/has_one_field.rb

@@ -29,7 +29,7 @@ module Avo
           related_record = nil
         else
           related_class = model.class.reflections[name.to_s.downcase].class_name
-          related_resource = Avo::App.resources.get_resource_by_model_class(related_class)
+          related_resource = Avo.resource_manager.get_resource_by_model_class(related_class)
           related_record = related_resource.find_record value
         end
 

data/lib/avo/fields/location_field.rb

@@ -3,13 +3,14 @@
 module Avo
   module Fields
     class LocationField < BaseField
-      attr_reader :stored_as
+      attr_reader :stored_as, :zoom
 
       def initialize(id, **args, &block)
         hide_on :index
         super(id, **args, &block)
 
         @stored_as = args[:stored_as].present? ? args[:stored_as] : nil # You can pass it an array of db columns [:latitude, :longitude]
+        @zoom = args[:zoom].present? ? args[:zoom].to_i : 15
       end
 
       def value_as_array?
@@ -59,11 +60,27 @@ module Avo
         end
       end
 
+      def value
+        if value_as_array?
+          [@record.send(stored_as.first), @record.send(stored_as.last)]
+        else
+          super
+        end
+      end
+
       def value_present?
         return value.first.present? && value.second.present? if value.is_a?(Array) && value.count == 2
 
         value.present?
       end
+
+      def assign_value(record:, value:)
+        return super if stored_as.blank?
+
+        stored_as.each_with_index do |database_id, index|
+          record.send("#{database_id}=", value[index])
+        end
+      end
     end
   end
 end

data/lib/avo/filters/base_filter.rb

@@ -15,7 +15,9 @@ module Avo
       delegate :params, to: Avo::Current
       delegate :request, to: Avo::Current
       delegate :view_context, to: Avo::Current
-      delegate :current_user, to: Avo::Current
+      def curent_user
+        Avo::Current.user
+      end
 
       class << self
         def decode_filters(filter_params)

data/lib/avo/html/builder.rb

@@ -22,7 +22,9 @@ class Avo::HTML::Builder
   delegate :app, to: Avo::Current
   delegate :root_path, to: :app
   delegate :params, to: Avo::Current
-  delegate :current_user, to: Avo::Current
+  def curent_user
+    Avo::Current.user
+  end
 
   def initialize(record: nil, resource: nil)
     @wrapper_stack = {}