avo 3.0.0.beta1 → 3.0.0.pre1

data/lib/avo/concerns/filters_session_handler.rb

@@ -1,3 +1,4 @@
+
 module Avo
   module Concerns
     module FiltersSessionHandler
@@ -33,11 +34,9 @@ module Avo
       end
 
       def cache_resource_filters?
-        Avo::ExecutionContext.new(
-          target: Avo.configuration.cache_resource_filters,
-          current_user: current_user,
-          resource: @resource
-        ).handle
+        return Avo.configuration.cache_resource_filters unless Avo.configuration.cache_resource_filters.is_a?(Proc)
+
+        Avo.configuration.cache_resource_filters.call(current_user: current_user, resource: @resource)
       end
     end
   end

data/lib/avo/concerns/has_item_type.rb

@@ -33,10 +33,6 @@ 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

@@ -3,117 +3,154 @@ module Avo
     module HasItems
       extend ActiveSupport::Concern
 
-      class_methods do
-        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
+      included do
+        class_attribute :items_holder
+      end
 
+      class_methods do
         # DSL methods
         def field(name, as: :text, **args, &block)
-          deprecated_dsl_api __method__, "fields"
+          ensure_items_holder_initialized
+
+          items_holder.field name, as: as, **args, &block
         end
 
         def panel(name = nil, **args, &block)
-          deprecated_dsl_api __method__, "fields"
-        end
+          ensure_items_holder_initialized
 
-        def row(**args, &block)
-          deprecated_dsl_api __method__, "fields"
+          items_holder.panel name, **args, &block
         end
 
         def tabs(**args, &block)
-          deprecated_dsl_api __method__, "fields"
+          ensure_items_holder_initialized
+
+          items_holder.tabs Avo::Resources::Items::TabGroup::Builder.parse_block(**args, &block)
         end
 
         def tool(klass, **args)
-          deprecated_dsl_api __method__, "fields"
+          ensure_items_holder_initialized
+
+          items_holder.tool klass, **args
         end
 
         def heading(body, **args)
-          deprecated_dsl_api __method__, "fields"
+          ensure_items_holder_initialized
+
+          items_holder.heading body, **args
         end
 
         def sidebar(**args, &block)
-          deprecated_dsl_api __method__, "fields"
+          ensure_items_holder_initialized
+
+          items_holder.sidebar Avo::Resources::Items::Sidebar::Builder.parse_block(**args, &block)
         end
         # END DSL methods
-      end
-
-      attr_writer :items_holder
 
-      delegate :invalid_fields, to: :items_holder
+        def items
+          if items_holder.present?
+            items_holder.items
+          else
+            []
+          end
+        end
 
-      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
-      delegate :sidebar, to: :items_holder
+        # Dives deep into panels and tabs to fetch all the fields for a resource.
+        def fields(only_root: false)
+          fields = []
 
-      def items_holder
-        @items_holder || Avo::Resources::Items::Holder.new
-      end
+          items.each do |item|
+            next if item.nil?
 
-      # def items
-      #   items_holder.items
-      # end
+            unless only_root
+              # Dive into panels to fetch their fields
+              if item.is_panel?
+                fields << extract_fields_from_items(item)
+              end
 
-      def invalid_fields
-        items_holder.invalid_fields
-      end
+              # Dive into tabs to fetch their fields
+              if item.is_tab_group?
+                item.items.map do |tab|
+                  fields << extract_fields_from_items(tab)
+                end
+              end
 
-      def fields(**args)
-        self.class.fields(**args)
-      end
+              # Dive into sidebar to fetch their fields
+              if item.is_sidebar?
+                fields << extract_fields_from_items(item)
+              end
+            end
 
-      def tab_groups
-        self.class.tab_groups
-      end
+            if item.is_field?
+              fields << item
+            end
+          end
 
-      # Dives deep into panels and tabs to fetch all the fields for a resource.
-      def only_fields(only_root: false)
-        fields = []
+          fields.flatten
+        end
 
-        items.each do |item|
-          next if item.nil?
+        def tab_groups
+          items.select do |item|
+            item.is_tab_group?
+          end
+        end
 
-          unless only_root
-            # Dive into panels to fetch their fields
-            if item.is_panel?
-              fields << extract_fields_from_items(item)
-            end
+        private
 
-            # Dive into tabs to fetch their fields
-            if item.is_tab_group?
-              item.items.map do |tab|
-                fields << extract_fields_from_items(tab)
-              end
-            end
+        def extract_fields_from_items(thing)
+          fields = []
 
-            # Dive into sidebar to fetch their fields
-            if item.is_sidebar?
+          thing.items.each do |item|
+            if item.is_field?
+              fields << item
+            elsif item.is_panel?
               fields << extract_fields_from_items(item)
             end
           end
 
-          if item.is_field?
-            fields << item
-          end
+          fields
+        end
 
-          if item.is_row?
-            fields << extract_fields_from_items(tab)
-          end
+        def ensure_items_holder_initialized
+          self.items_holder ||= Avo::Resources::Items::Holder.new
         end
+      end
+
+      attr_accessor :items_holder
 
-        fields.flatten
+      delegate :invalid_fields, to: :items_holder
+      delegate :items, to: :items_holder
+
+      def hydrate_fields
+        fields.map do |field|
+          field.hydrate(record: @record, view: @view, resource: self)
+        end
+        self
+      end
+
+      def fields(**args)
+        self.class.fields(**args)
+      end
+
+      def tab_groups
+        self.class.tab_groups
       end
 
       def get_field_definitions(only_root: false)
-        only_fields(only_root: only_root).map do |field|
+        fields = self.fields(only_root: only_root)
+
+        return [] if fields.blank?
+
+        items = fields.map do |field|
           field.hydrate(resource: self, user: user, view: view)
         end
+
+        if Avo::App.license.lacks_with_trial(:advanced_fields)
+          items = items.reject do |field|
+            field.type == "tags"
+          end
+        end
+
+        items
       end
 
       def get_preview_fields
@@ -166,10 +203,7 @@ module Avo
           end
         end
 
-        # hydrate_fields fields
-        fields.each do |field|
-          field.hydrate(record: @record, view: @view, resource: self)
-        end
+        hydrate_fields
 
         fields
       end
@@ -222,10 +256,8 @@ 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|
-              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)
+              panel.items.grep(Avo::Fields::BelongsToField).each do |field|
+                field.target = :_top
               end
             end
           end
@@ -261,6 +293,9 @@ module Avo
 
             item
           end
+          .select do |item|
+            item.visible_in_view?(view: view)
+          end
           .select do |item|
             item.visible?
           end
@@ -272,8 +307,7 @@ module Avo
             end
           end
           .select do |item|
-            # 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.is_heading? && view.in?([:edit, :update, :new, :create])
               if item.respond_to?(:id)
                 item.resource.record.respond_to?("#{item.id}=")
               else
@@ -299,26 +333,14 @@ module Avo
         visible_items.blank?
       end
 
-      private
+      def hydrate(**args)
+        super(**args)
 
-      def set_target_to_top(fields)
-        fields.each do |field|
-          field.target = :_top
+        items_holder.items.each do |item|
+          item.hydrate(**args)
         end
-      end
-
-      def extract_fields_from_items(thing)
-        fields = []
 
-        thing.items.each do |item|
-          if item.is_field?
-            fields << item
-          elsif item.is_panel? || item.is_row?
-            fields << extract_fields_from_items(item)
-          end
-        end
-
-        fields
+        self
       end
     end
   end

data/lib/avo/concerns/is_visible.rb

@@ -6,7 +6,7 @@ module Avo
 
       def visible?
         # Default to true
-        return true if visible.nil?
+        return true unless visible.present?
 
         Avo::ExecutionContext.new(target: visible, resource: @resource).handle
       end

data/lib/avo/concerns/model_class_constantized.rb

@@ -4,6 +4,8 @@ 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,9 +2,8 @@ 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 +41,7 @@ module Avo
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
     attr_accessor :resources
-    attr_accessor :prefix_path
+    attr_writer :branding
 
     def initialize
       @root_path = "/avo"
@@ -116,8 +115,8 @@ module Avo
     end
 
     def namespace
-      if Avo.configuration.root_path.present?
-        Avo.configuration.root_path.delete "/"
+      if computed_root_path.present?
+        computed_root_path.delete "/"
       else
         root_path.delete "/"
       end
@@ -129,6 +128,10 @@ module Avo
       @root_path
     end
 
+    def computed_root_path
+      Avo.configuration.root_path
+    end
+
     def feature_enabled?(feature)
       !@disabled_features.map(&:to_sym).include?(feature.to_sym)
     end
@@ -136,10 +139,6 @@ 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,39 +1,5 @@
 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, :user, :view_context
-  attribute :error_manager
-  attribute :resource_manager
-  attribute :tool_manager
-  attribute :plugin_manager
-
-  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
+  attribute :params, :request, :context, :current_user, :view_context
 end

data/lib/avo/dsl/field_parser.rb

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

data/lib/avo/dynamic_router.rb

@@ -1,23 +1,12 @@
 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::DynamicRouter.eager_load(:resources) unless Rails.application.config.eager_load
+            Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
           end
 
           Avo::Resources::ResourceManager.fetch_resources
@@ -28,7 +17,7 @@ module Avo
               resource.is_a? Class
             end
             .map do |resource|
-              resources resource.route_key do
+              resources resource.new.route_key do
                 member do
                   get :preview
                 end

data/lib/avo/engine.rb

@@ -3,19 +3,20 @@ 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"
     require "active_storage/engine"
-  when "actiontext"
-    require "action_text/engine"
   else
     require d.name
   end
 end
 
+# In development we should load the engine so we get the autoload for components
+if ENV["RAILS_ENV"] === "development"
+  require "view_component/engine"
+end
+
 module Avo
   class Engine < ::Rails::Engine
     isolate_namespace Avo
@@ -25,7 +26,8 @@ module Avo
       ::Avo.asset_manager.reset
 
       # Boot Avo
-      ::Avo.boot
+      ::Avo::App.boot
+      ::Avo.plugin_manager.boot_plugins
 
       # After deploy we want to make sure the license response is being cleared.
       # We need a fresh license response.
@@ -42,7 +44,7 @@ module Avo
     # Ensure we reboot the app when something changes
     config.to_prepare do
       # Boot Avo
-      ::Avo.boot
+      ::Avo::App.boot
     end
 
     initializer "avo.autoload" do |app|
@@ -57,6 +59,10 @@ 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
@@ -67,7 +73,7 @@ module Avo
 
     initializer "avo.test_buddy" do |app|
       if Avo::IN_DEVELOPMENT
-        Rails.autoloaders.main.push_dir Avo::Engine.root.join("spec", "testing_helpers")
+        Rails.autoloaders.main.push_dir Avo::Engine.root.join("spec", "helpers")
       end
     end
 
@@ -89,9 +95,5 @@ 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

@@ -1,6 +1,6 @@
 module Avo
   class ExecutionContext
-    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo
+    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include
 
     def initialize(**args)
       # Extend the class with custom modules if required.
@@ -20,12 +20,10 @@ module Avo
 
       # Set defaults on not initialized accessors
       @context ||= Avo::Current.context
-      @current_user ||= Avo::Current.user
+      @current_user ||= Avo::Current.current_user
       @params ||= Avo::Current.params
       @request ||= Avo::Current.request
       @view_context ||= Avo::Current.view_context
-      @main_app ||= @view_context.main_app
-      @avo ||= @view_context.avo
     end
 
     delegate :result, to: :card