avo 2.45.0 → 3.0.2

data/lib/avo/concerns/is_visible.rb

@@ -0,0 +1,15 @@
+# Adds the ability to set the visibility of an item in the execution context.
+module Avo
+  module Concerns
+    module IsVisible
+      attr_accessor :visible
+
+      def visible?
+        # Default to true
+        return true if visible.nil?
+
+        Avo::ExecutionContext.new(target: visible, resource: @resource).handle
+      end
+    end
+  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/concerns/visible_in_different_views.rb

@@ -0,0 +1,132 @@
+module Avo
+  module Concerns
+    module VisibleInDifferentViews
+      attr_accessor :show_on_index
+      attr_accessor :show_on_show
+      attr_accessor :show_on_new
+      attr_accessor :show_on_edit
+      attr_accessor :show_on_preview
+
+      def post_initialize
+        initialize_views
+      end
+
+      def initialize_views
+        # Set defaults
+        @show_on_index = @show_on_index.nil? ? true : @show_on_index
+        @show_on_show = @show_on_show.nil? ? true : @show_on_show
+        @show_on_new = @show_on_new.nil? ? true : @show_on_new
+        @show_on_edit = @show_on_edit.nil? ? true : @show_on_edit
+        @show_on_preview = @show_on_preview.nil? ? false : @show_on_preview
+
+        if @args.present?
+          # Execute options
+          show_on @args[:show_on] if @args[:show_on].present?
+          hide_on @args[:hide_on] if @args[:hide_on].present?
+          only_on @args[:only_on] if @args[:only_on].present?
+          except_on @args[:except_on] if @args[:except_on].present?
+        end
+      end
+
+      # Validates if the field is visible on certain view
+      def visible_in_view?(view:)
+        raise "No view specified on visibility check." if view.blank?
+
+        send "show_on_#{view}"
+      end
+
+      def show_on(*where)
+        return show_on_all if where.include? :all
+
+        normalize_views(where).flatten.each do |view|
+          show_on_view view
+        end
+      end
+
+      def hide_on(*where)
+        return hide_on_all if where.include? :all
+
+        normalize_views(where).flatten.each do |view|
+          hide_on_view view
+        end
+      end
+
+      def only_on(*where)
+        hide_on_all
+        normalize_views(where).flatten.each do |view|
+          show_on_view view
+        end
+      end
+
+      def except_on(*where)
+        show_on_all
+        normalize_views(where).flatten.each do |view|
+          hide_on_view view
+        end
+      end
+
+      # When submitting the form on creation, the new page will be create but we don't have a visibility marker for create so we'll default to new
+      def show_on_create
+        show_on_new
+      end
+
+      # When submitting the form on update, the new page will be create but we don't have a visibility marker for update so we'll default to edit
+      def show_on_update
+        show_on_edit
+      end
+
+      private
+
+      def show_on_view(view)
+        send("show_on_#{view}=", true)
+      end
+
+      def hide_on_view(view)
+        send("show_on_#{view}=", false)
+      end
+
+      def only_on_view(view)
+        hide_on_all
+        show_on_view view
+      end
+
+      def except_on_view(view)
+        show_on_all
+        hide_on_view view
+      end
+
+      def show_on_all
+        @show_on_index = true
+        @show_on_show = true
+        @show_on_edit = true
+        @show_on_new = true
+        @show_on_preview = true
+      end
+
+      def hide_on_all
+        @show_on_index = false
+        @show_on_show = false
+        @show_on_edit = false
+        @show_on_new = false
+        @show_on_preview = false
+      end
+
+      def normalize_views(*views_and_groups)
+        forms = views_and_groups.flatten! & [:forms]
+        display = views_and_groups & [:display]
+
+        if forms.present?
+          views_and_groups -= forms
+          views_and_groups += [:new, :edit]
+        end
+
+        if display.present?
+          views_and_groups -= display
+          views_and_groups += [:index, :show]
+        end
+
+        views_and_groups.flatten.uniq
+      end
+    end
+  end
+end

data/lib/avo/concerns/visible_items.rb

@@ -3,48 +3,17 @@ module Avo
   module Concerns
     module VisibleItems
       extend ActiveSupport::Concern
-      def items
-        if items_holder.present?
-          items_holder.items
-        else
-          []
-        end
-      end
-
-      def visible_items
-        items
-          .map do |item|
-            if item.respond_to? :hydrate
-              item.hydrate(view: view)
-            end
-
-            item
-          end
-          .map do |item|
-            visible(item) ? item : nil
-          end
-          .compact
-      end
-
-      def visible(item)
-        return item.visible? unless item.is_field?
 
-        return false if item.respond_to?(:authorized?) && item.resource.present? && !item.authorized?
-
-        item.visible? && item.visible_on?(view)
+      included do
+        include Avo::Concerns::Hydration
       end
 
       def visible?
-        any_item_visible = visible_items.any?
-        return any_item_visible unless respond_to?(:visible_on?)
-
-        visible_on?(view) && any_item_visible
-      end
-
-      def hydrate(view: nil)
-        @view = view
-
-        self
+        if respond_to?(:visible_on?)
+          visible_on?(view) && visible_items.any?
+        else
+          visible_items.any?
+        end
       end
     end
   end

data/lib/avo/configuration/branding.rb

@@ -32,40 +32,28 @@ class Avo::Configuration::Branding
   end
 
   def logo
-    return @default_logo if Avo::App.license.lacks_with_trial(:branding)
-
     @logo || @default_logo
   end
 
   def logomark
-    return @default_logomark if Avo::App.license.lacks_with_trial(:branding)
-
     @logomark || @default_logomark
   end
 
   def placeholder
-    return @default_placeholder if Avo::App.license.lacks_with_trial(:branding)
-
     @placeholder || @default_placeholder
   end
 
   def chart_colors
-    return @default_chart_colors if Avo::App.license.lacks_with_trial(:branding)
-
     @chart_colors || @default_chart_colors
   end
 
   def favicon
-    return @default_favicon if Avo::App.license.lacks_with_trial(:branding)
-
     @favicon || @default_favicon
   end
 
   private
 
   def colors
-    return @default_colors if Avo::App.license.lacks_with_trial(:branding)
-
     @default_colors.merge(@colors) || @default_colors
   end
 

data/lib/avo/configuration.rb

@@ -13,7 +13,6 @@ module Avo
     attr_accessor :locale
     attr_accessor :currency
     attr_accessor :default_view_type
-    attr_accessor :license
     attr_accessor :license_key
     attr_accessor :authorization_methods
     attr_accessor :authenticate
@@ -38,13 +37,14 @@ module Avo
     attr_accessor :main_menu
     attr_accessor :profile_menu
     attr_accessor :model_resource_mapping
-    attr_accessor :tabs_style
-    attr_accessor :resource_default_view
+    attr_reader :resource_default_view
     attr_accessor :authorization_client
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
     attr_accessor :resources
     attr_accessor :prefix_path
+    attr_accessor :resource_parent_controller
+    attr_accessor :mount_avo_engines
 
     def initialize
       @root_path = "/avo"
@@ -56,7 +56,6 @@ module Avo
       @locale = nil
       @currency = "USD"
       @default_view_type = :table
-      @license = "community"
       @license_key = nil
       @current_user = proc {}
       @authenticate = proc {}
@@ -91,12 +90,12 @@ module Avo
       @main_menu = nil
       @profile_menu = nil
       @model_resource_mapping = {}
-      @tabs_style = :tabs
-      @resource_default_view = :show
+      @resource_default_view = Avo::ViewInquirer.new("show")
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
       @resources = nil
-      @prefix_path = nil
+      @resource_parent_controller = "Avo::ResourcesController"
+      @mount_avo_engines = true
       @cache_store = computed_cache_store
     end
 
@@ -143,13 +142,31 @@ module Avo
     end
 
     def app_name
-      if @app_name.respond_to? :call
-        Avo::Hosts::BaseHost.new(block: @app_name).handle
-      else
-        @app_name
+      Avo::ExecutionContext.new(target: @app_name).handle
+    end
+
+    def license=(value)
+      if Rails.env.development?
+        puts "[Avo DEPRECATION WARNING]: The `config.license` configuration option is no longer supported and will be removed in future versions. Please discontinue its use and solely utilize the `license_key` instead."
       end
     end
 
+    def license
+      gems = Gem::Specification.map {|gem| gem.name}
+
+      @license ||= if gems.include?("avo-advanced")
+        "advanced"
+      elsif gems.include?("avo-pro")
+        "pro"
+      elsif gems.include?("avo")
+        "community"
+      end
+    end
+
+    def resource_default_view=(view)
+      @resource_default_view = Avo::ViewInquirer.new(view.to_s)
+    end
+
     def cache_store
       Avo::ExecutionContext.new(
         target: @cache_store,

data/lib/avo/current.rb

@@ -0,0 +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, :user, :view_context
+  attribute :error_manager
+  attribute :resource_manager
+  attribute :tool_manager
+  attribute :plugin_manager
+  attribute :locale
+
+  # Protect from error #<RuntimeError: Missing rack.input> when request is ActionDispatch::Request.empty
+  def params
+    request.params
+  rescue
+    {}
+  end
+
+  def request
+    view_context&.request || ActionDispatch::Request.empty
+  end
+end

data/lib/avo/dsl/field_parser.rb

@@ -10,7 +10,7 @@ module Avo
 
       def initialize(id:, order_index: 0, **args, &block)
         @id = id
-        @as = args.fetch(:as, nil)
+        @as = args.fetch(:as, :text)
         @order_index = order_index
         @args = args
         @block = block
@@ -47,7 +47,7 @@ module Avo
         else
           # The symbol can be transformed to a class and found.
           class_name = as.to_s.camelize
-          field_class = "#{class_name}Field"
+          field_class = "Avo::Fields::#{class_name}Field"
 
           # Discover & load custom field classes
           if Object.const_defined? field_class
@@ -72,7 +72,7 @@ module Avo
       end
 
       def field_class_from_symbol(symbol)
-        matched_field = Avo::App.fields.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,15 +1,26 @@
 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::App.fetch_resources
+          Avo::Resources::ResourceManager.fetch_resources
             .select do |resource|
               resource != :BaseResource
             end
@@ -17,7 +28,11 @@ module Avo
               resource.is_a? Class
             end
             .map do |resource|
-              resources resource.new.route_key
+              resources resource.route_key do
+                member do
+                  get :preview
+                end
+              end
             end
         end
       end

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"
@@ -19,23 +21,40 @@ module Avo
     isolate_namespace Avo
 
     config.after_initialize do
-      # Boot Avo
-      ::Avo::App.boot
-    end
+      # Reset before reloads in development
+      ::Avo.asset_manager.reset
 
-    initializer "avo.autoload" do |app|
-      Avo::ENTITIES.values.each do |path_params|
-        path = Rails.root.join(*path_params)
+      # Boot Avo
+      ::Avo.boot
 
-        if File.directory? path.to_s
-          Rails.autoloaders.main.push_dir path.to_s
+      # After deploy we want to make sure the license response is being cleared.
+      # We need a fresh license response.
+      # This is disabled in development because the initialization process might be triggered more than once.
+      unless Rails.env.development?
+        begin
+          Licensing::HQ.new.clear_response
+        rescue => exception
+          Avo.logger.info "Failed to clear Avo HQ response: #{exception.message}"
         end
       end
     end
 
-    initializer "avo.init_fields" do |app|
-      # Init the fields
-      ::Avo::App.init_fields
+    # Ensure we reboot the app when something changes
+    config.to_prepare do
+      # Boot Avo
+      ::Avo.boot
+    end
+
+    initializer "avo.autoload" do |app|
+      # This undoes Rails' previous nested directories behavior in the `app` dir.
+      # More on this: https://github.com/fxn/zeitwerk/issues/250
+      avo_directory = Rails.root.join("app", "avo").to_s
+      ActiveSupport::Dependencies.autoload_paths.delete(avo_directory)
+
+      if Dir.exist?(avo_directory)
+        Rails.autoloaders.main.push_dir(avo_directory, namespace: Avo)
+        app.config.watchable_dirs[avo_directory] = [:rb]
+      end
     end
 
     initializer "avo.reloader" do |app|
@@ -46,17 +65,16 @@ module Avo
       end
     end
 
-    initializer "debug_exception_response_format" do |app|
-      app.config.debug_exception_response_format = :api
-      # app.config.logger = ::Logger.new(STDOUT)
-    end
-
     initializer "avo.test_buddy" do |app|
       if Avo::IN_DEVELOPMENT
-        Rails.autoloaders.main.push_dir Avo::Engine.root.join("spec", "helpers")
+        Rails.autoloaders.main.push_dir Avo::Engine.root.join("spec", "testing_helpers")
       end
     end
 
+    initializer "debug_exception_response_format" do |app|
+      app.config.debug_exception_response_format = :api
+    end
+
     config.app_middleware.use(
       Rack::Static,
       urls: ["/avo-assets"],
@@ -75,18 +93,5 @@ module Avo
     initializer "avo.locales" do |app|
       I18n.load_path += Dir[Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "*.{rb,yml}")]
     end
-
-    # After deploy we want to make sure the license response is being cleared.
-    # We need a fresh license response.
-    # This is disabled in development because the initialization process might be triggered more than once.
-    config.after_initialize do
-      unless Rails.env.development?
-        begin
-          Licensing::HQ.new.clear_response
-        rescue => exception
-          puts "Failed to clear Avo HQ response: #{exception.message}"
-        end
-      end
-    end
   end
 end

data/lib/avo/error_manager.rb

@@ -0,0 +1,25 @@
+module Avo
+  class ErrorManager
+    class << self
+      def build
+        new
+      end
+    end
+
+    attr_reader :errors
+
+    alias_method :all, :errors
+
+    def initialize
+      @errors = []
+    end
+
+    def add(error)
+      errors << error
+    end
+
+    def has_errors?
+      errors.present?
+    end
+  end
+end

data/lib/avo/execution_context.rb

@@ -1,6 +1,8 @@
 module Avo
   class ExecutionContext
-    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo
+    include Avo::Concerns::HasHelpers
+
+    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo, :locale
 
     def initialize(**args)
       # Extend the class with custom modules if required.
@@ -10,13 +12,6 @@ module Avo
         end
       end
 
-      # If you want this block to behave like a view you can delegate the missing methods to the view_context
-      #
-      # Ex: Avo::ExecutionContext.new(target: ..., delegate_missing_to: :view_context).handle
-      if args[:delegate_missing_to].present?
-        self.class.send(:delegate_missing_to, args[:delegate_missing_to])
-      end
-
       # If target doesn't respond to call, we don't need to initialize the others attr_accessors.
       return unless (@target = args[:target]).respond_to? :call
 
@@ -26,15 +21,19 @@ module Avo
       end
 
       # Set defaults on not initialized accessors
-      @context ||= Avo::App.context
-      @params ||= Avo::App.params
-      @view_context ||= Avo::App.view_context
-      @current_user ||= Avo::App.current_user
-      @request ||= view_context&.request
-      @main_app ||= view_context&.main_app
-      @avo ||= view_context&.avo
+      @context ||= Avo::Current.context
+      @current_user ||= Avo::Current.user
+      @params ||= Avo::Current.params
+      @request ||= Avo::Current.request
+      @view_context ||= Avo::Current.view_context
+      @locale ||= Avo::Current.locale
+      @main_app ||= @view_context&.main_app
+      @avo ||= @view_context&.avo
     end
 
+    delegate :result, to: :card
+    delegate :authorize, to: Avo::Services::AuthorizationService
+
     # Return target if target is not callable, otherwise, execute target on this instance context
     def handle
       target.respond_to?(:call) ? instance_exec(&target) : target