avo 3.0.0.pre19 → 3.0.1.beta1

data/lib/avo/concerns/has_items.rb

@@ -30,6 +30,10 @@ module Avo
           deprecated_dsl_api __method__, "fields"
         end
 
+        def heading(body, **args)
+          deprecated_dsl_api __method__, "fields"
+        end
+
         def sidebar(**args, &block)
           deprecated_dsl_api __method__, "fields"
         end
@@ -269,7 +273,7 @@ module Avo
           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?(%w[edit update new create])
+            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

data/lib/avo/concerns/visible_in_different_views.rb

@@ -61,7 +61,7 @@ module Avo
       def except_on(*where)
         show_on_all
         normalize_views(where).flatten.each do |view|
-          hide_on_view view
+          show_on_view view
         end
       end
 
@@ -113,18 +113,12 @@ module Avo
 
       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

data/lib/avo/configuration.rb

@@ -12,6 +12,7 @@ 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
@@ -36,14 +37,12 @@ module Avo
     attr_accessor :main_menu
     attr_accessor :profile_menu
     attr_accessor :model_resource_mapping
-    attr_reader :resource_default_view
+    attr_accessor :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"
@@ -55,6 +54,7 @@ module Avo
       @locale = nil
       @currency = "USD"
       @default_view_type = :table
+      @license = "community"
       @license_key = nil
       @current_user = proc {}
       @authenticate = proc {}
@@ -89,12 +89,10 @@ module Avo
       @main_menu = nil
       @profile_menu = nil
       @model_resource_mapping = {}
-      @resource_default_view = Avo::ViewInquirer.new("show")
+      @resource_default_view = :show
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
       @resources = nil
-      @resource_parent_controller = "Avo::ResourcesController"
-      @mount_avo_engines = true
     end
 
     def current_user_method(&block)
@@ -142,28 +140,6 @@ module Avo
     def 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
   end
 
   def self.configuration

data/lib/avo/current.rb

@@ -24,11 +24,16 @@ class Avo::Current < ActiveSupport::CurrentAttributes
   attribute :resource_manager
   attribute :tool_manager
   attribute :plugin_manager
-  attribute :locale
 
   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

@@ -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 = "Avo::Fields::#{class_name}Field"
+          field_class = "#{class_name}Field"
 
           # Discover & load custom field classes
           if Object.const_defined? field_class

data/lib/avo/execution_context.rb

@@ -1,8 +1,6 @@
 module Avo
   class ExecutionContext
-    include Avo::Concerns::HasHelpers
-
-    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo, :locale
+    attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo
 
     def initialize(**args)
       # Extend the class with custom modules if required.
@@ -26,7 +24,6 @@ module Avo
       @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

data/lib/avo/fields/badge_field.rb

@@ -8,7 +8,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, neutral: :neutral}
+        default_options = {info: :info, success: :success, danger: :danger, warning: :warning}
         @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end

data/lib/avo/fields/base_field.rb

@@ -7,7 +7,6 @@ module Avo
       prepend Avo::Concerns::IsResourceItem
       include Avo::Concerns::IsVisible
       include Avo::Concerns::VisibleInDifferentViews
-      include Avo::Concerns::HasHelpers
       include Avo::Fields::Concerns::HasFieldName
       include Avo::Fields::Concerns::HasDefault
       include Avo::Fields::Concerns::HasHTMLAttributes
@@ -15,7 +14,6 @@ module Avo
       include Avo::Fields::Concerns::IsReadonly
       include Avo::Fields::Concerns::IsDisabled
       include Avo::Fields::Concerns::IsRequired
-      include Avo::Fields::Concerns::UseViewComponents
 
       include ActionView::Helpers::UrlHelper
 
@@ -75,12 +73,11 @@ module Avo
         @visible = args[:visible]
         @as_avatar = args[:as_avatar] || false
         @html = args[:html] || nil
-        @view = Avo::ViewInquirer.new(args[:view]) || nil
+        @view = args[:view] || nil
         @value = args[:value] || nil
         @stacked = args[:stacked] || nil
         @for_presentation_only = args[:for_presentation_only] || false
         @resource = args[:resource]
-        @components = args[:components] || {}
 
         @args = args
 
@@ -158,7 +155,14 @@ module Avo
 
         # Run computable callback block if present
         if computable && block.present?
-          final_value = execute_block
+          final_value = Avo::ExecutionContext.new(
+            target: block,
+            record: record,
+            resource: @resource,
+            view: @view,
+            field: self,
+            include: self.class.included_modules
+          ).handle
         end
 
         # Run the value through resolver if present
@@ -177,17 +181,6 @@ module Avo
         final_value
       end
 
-      def execute_block
-        Avo::ExecutionContext.new(
-          target: block,
-          record: record,
-          resource: resource,
-          view: view,
-          field: self,
-          include: self.class.included_modules
-        ).handle
-      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
@@ -199,8 +192,7 @@ module Avo
             key: key,
             value: value,
             resource: resource,
-            field: self,
-            include: self.class.included_modules
+            field: self
           ).handle
         end
 
@@ -228,8 +220,35 @@ module Avo
         id.to_sym
       end
 
+      def view_component_name
+        "#{type.camelize}Field"
+      end
+
+      # For custom components the namespace will be different than Avo::Fields so we should take that into account.
+      def view_component_namespace
+        "#{self.class.to_s.deconstantize}::#{view_component_name}"
+      end
+
+      # Try and build the component class or fallback to a blank one
+      def component_for_view(view = :index)
+        # Use the edit variant for all "update" views
+        view = :edit if view.in? [:new, :create, :update]
+
+        component_class = "#{view_component_namespace}::#{view.to_s.camelize}Component"
+        component_class.constantize
+      rescue
+        unless Rails.env.test?
+          Avo.logger.info "Failed to find component for the `#{self.class}` field on the `#{view}` view."
+        end
+        # When returning nil, a race condition happens and throws an error in some environments.
+        # See https://github.com/avo-hq/avo/pull/365
+        ::Avo::BlankFieldComponent
+      end
+
       def record_errors
-        record.nil? ? {} : record.errors
+        return {} if record.nil?
+
+        record.errors
       end
 
       def type
@@ -270,7 +289,11 @@ module Avo
       private
 
       def model_or_class(model)
-        model.instance_of?(String) ? "class" : "model"
+        if model.instance_of?(String)
+          "class"
+        else
+          "model"
+        end
       end
 
       def is_model?(model)
@@ -282,7 +305,7 @@ module Avo
       end
 
       def on_create?
-        @view.in?(%w[new create])
+        @view.in?([:new, :create])
       end
 
       def in_action?

data/lib/avo/fields/belongs_to_field.rb

@@ -259,7 +259,7 @@ module Avo
       end
 
       def name
-        return polymorphic_as.to_s.humanize if polymorphic_as.present? && view.index?
+        return polymorphic_as.to_s.humanize if polymorphic_as.present? && view == :index
 
         super
       end

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

@@ -13,8 +13,6 @@ module Avo
         # get_html :classes, view: :show, element: :wrapper
         # get_html :styles, view: :index, element: :wrapper
         def get_html(name = nil, element:, view:)
-          view = view.to_sym if view.present?
-
           if [view, element].any?(&:nil?)
             default_attribute_value name
           end

data/lib/avo/fields/external_image_field.rb

@@ -4,12 +4,12 @@ module Avo
       attr_reader :width
       attr_reader :height
       attr_reader :radius
-      attr_reader :link_to_record
+      attr_reader :link_to_resource
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
 
         @width = args[:width].present? ? args[:width] : 40
         @height = args[:height].present? ? args[:height] : 40

data/lib/avo/fields/file_field.rb

@@ -1,7 +1,7 @@
 module Avo
   module Fields
     class FileField < BaseField
-      attr_accessor :link_to_record
+      attr_accessor :link_to_resource
       attr_accessor :is_avatar
       attr_accessor :is_image
       attr_accessor :is_audio
@@ -12,7 +12,7 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
         @is_avatar = args[:is_avatar].present? ? args[:is_avatar] : false
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false

data/lib/avo/fields/gravatar_field.rb

@@ -4,7 +4,7 @@ require "erb"
 module Avo
   module Fields
     class GravatarField < BaseField
-      attr_reader :link_to_record
+      attr_reader :link_to_resource
       attr_reader :rounded
       attr_reader :size
       attr_reader :default
@@ -16,7 +16,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
         @rounded = args[:rounded].nil? ? true : args[:rounded]
         @size = args[:size].present? ? args[:size].to_i : 32
         @default = args[:default].present? ? ERB::Util.url_encode(args[:default]).to_s : ""

data/lib/avo/fields/has_base_field.rb

@@ -79,8 +79,8 @@ module Avo
 
       # Adds the view override component
       # has_one, has_many, has_and_belongs_to_many fields don't have edit views
-      def component_for_view(view = Avo::ViewInquirer.new("index"))
-        view = Avo::ViewInquirer.new("show") if view.in? %w[new create update edit]
+      def component_for_view(view = :index)
+        view = :show if view.in? [:new, :create, :update, :edit]
 
         super view
       end

data/lib/avo/fields/heading_field.rb

@@ -4,27 +4,35 @@ module Avo
   module Fields
     class HeadingField < BaseField
       attr_reader :as_html
+      attr_reader :empty
+
+      def initialize(content, **args, &block)
+        # Mark the field as empty if there's no content passed
+        @empty = content.blank?
+        # Add dummy content
+        content ||= SecureRandom.hex
 
-      def initialize(id, **args, &block)
         args[:updatable] = false
-        @label = args[:label] || id.to_s.humanize
 
-        super(id, **args, &block)
+        super(content, **args, &block)
 
         # this field is not used to update anything
         @for_presentation_only = true
 
         hide_on :index
 
-        @as_html = args[:as_html].presence || false
+        @as_html = args[:as_html].present? ? args[:as_html] : false
       end
 
       def id
         "heading_#{name.to_s.parameterize.underscore}"
       end
 
+      # Override the value method if the field is empty
       def value
-        block.present? ? execute_block : @label
+        return nil if empty
+
+        super
       end
     end
   end

data/lib/avo/fields/id_field.rb

@@ -1,7 +1,7 @@
 module Avo
   module Fields
     class IdField < BaseField
-      attr_reader :link_to_record
+      attr_reader :link_to_resource
 
       def initialize(id, **args, &block)
         args[:readonly] = true
@@ -12,7 +12,7 @@ module Avo
 
         add_boolean_prop args, :sortable, true
 
-        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
     end
   end

data/lib/avo/fields/status_field.rb

@@ -6,15 +6,13 @@ module Avo
 
         @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten.map(&:to_sym) : [:waiting, :running]
         @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten.map(&:to_sym) : [:failed]
-        @success_when = args[:success_when].present? ? [args[:success_when]].flatten.map(&:to_sym) : []
       end
 
       def status
-        status = "neutral"
+        status = "success"
         if value.present?
           status = "failed" if @failed_when.include? value.to_sym
           status = "loading" if @loading_when.include? value.to_sym
-          status = "success" if @success_when.include? value.to_sym
         end
 
         status

data/lib/avo/fields/text_field.rb

@@ -1,14 +1,14 @@
 module Avo
   module Fields
     class TextField < BaseField
-      attr_reader :link_to_record
+      attr_reader :link_to_resource
       attr_reader :as_html
       attr_reader :protocol
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        add_boolean_prop args, :link_to_record
+        add_boolean_prop args, :link_to_resource
         add_boolean_prop args, :as_html
         add_string_prop args, :protocol
       end

data/lib/avo/filters/base_filter.rb

@@ -15,7 +15,7 @@ module Avo
       delegate :params, to: Avo::Current
       delegate :request, to: Avo::Current
       delegate :view_context, to: Avo::Current
-      def current_user
+      def curent_user
         Avo::Current.user
       end
 

data/lib/avo/html/builder.rb

@@ -22,7 +22,7 @@ class Avo::HTML::Builder
   delegate :app, to: Avo::Current
   delegate :root_path, to: :app
   delegate :params, to: Avo::Current
-  def current_user
+  def curent_user
     Avo::Current.user
   end
 

data/lib/avo/licensing/h_q.rb

@@ -5,7 +5,7 @@ module Avo
       attr_accessor :cache_store
 
       # ENDPOINT = "https://v3.avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
-      ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
+      # ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
       CACHE_TIME = 3600 unless const_defined?(:CACHE_TIME) # seconds
 

data/lib/avo/licensing/license_manager.rb

@@ -9,7 +9,7 @@ module Avo
         case @hq_response["id"]
         when "community"
           CommunityLicense.new @hq_response
-        when "pro", "advanced"
+        when "pro"
           ProLicense.new @hq_response
         else
           NilLicense.new @hq_response

data/lib/avo/resources/items/holder.rb

@@ -56,6 +56,12 @@ class Avo::Resources::Items::Holder
     add_item panel
   end
 
+  def heading(body = nil, **args, &block)
+    field = Avo::Fields::HeadingField.new(body, **args)
+
+    add_item field
+  end
+
   def sidebar(**args, &block)
     add_item Avo::Resources::Items::Sidebar::Builder.parse_block(**args, &block)
   end

data/lib/avo/resources/items/item_group.rb

@@ -3,7 +3,7 @@ class Avo::Resources::Items::ItemGroup
 
   include Avo::Concerns::HasItems
   include Avo::Concerns::HasItemType
-  include Avo::Concerns::VisibleItems
+  include Avo::Concerns::IsVisible
   include Avo::Concerns::VisibleInDifferentViews
 
   attr_reader :name
@@ -13,7 +13,7 @@ class Avo::Resources::Items::ItemGroup
 
   def initialize(name: nil, description: nil, view: nil, **args)
     @name = name
-    @view = Avo::ViewInquirer.new view
+    @view = view
     @description = description
     @items_holder = Avo::Resources::Items::Holder.new
     @args = args

data/lib/avo/resources/items/row.rb

@@ -2,7 +2,7 @@ class Avo::Resources::Items::Row
   include Avo::Concerns::IsResourceItem
   include Avo::Concerns::HasItems
   include Avo::Concerns::HasItemType
-  include Avo::Concerns::VisibleItems
+  include Avo::Concerns::IsVisible
 
   class_attribute :item_type, default: :row
 
@@ -12,12 +12,12 @@ class Avo::Resources::Items::Row
   delegate :items, :add_item, to: :items_holder
 
   def initialize(view: nil)
-    @view = Avo::ViewInquirer.new view
+    @view = view
     @items_holder = Avo::Resources::Items::Holder.new
   end
 
   def hydrate(view: nil, resource: nil, **args)
-    @view = Avo::ViewInquirer.new view
+    @view = view
     @resource = resource
 
     self

data/lib/avo/resources/items/sidebar.rb

@@ -13,7 +13,7 @@ class Avo::Resources::Items::Sidebar
   def initialize(name: nil, view: nil, **args)
     @name = name
     @items_holder = Avo::Resources::Items::Holder.new
-    @view = Avo::ViewInquirer.new view
+    @view = view
     @args = args
 
     post_initialize if respond_to?(:post_initialize)

data/lib/avo/resources/items/tab.rb

@@ -3,7 +3,7 @@ class Avo::Resources::Items::Tab
 
   include Avo::Concerns::HasItems
   include Avo::Concerns::HasItemType
-  include Avo::Concerns::VisibleItems
+  include Avo::Concerns::IsVisible
   include Avo::Concerns::VisibleInDifferentViews
 
   delegate :items, :add_item, to: :items_holder
@@ -14,7 +14,7 @@ class Avo::Resources::Items::Tab
     @name = name
     @description = description
     @items_holder = Avo::Resources::Items::Holder.new
-    @view = Avo::ViewInquirer.new view
+    @view = view
     @args = args
 
     post_initialize if respond_to?(:post_initialize)

data/lib/avo/resources/items/tab_group.rb

@@ -12,7 +12,7 @@ class Avo::Resources::Items::TabGroup
   def initialize(index: 0, view: nil, style: nil, **args)
     @index = index
     @items_holder = Avo::Resources::Items::Holder.new
-    @view = Avo::ViewInquirer.new view
+    @view = view
     @style = style
     @args = args
 

data/lib/avo/resources/resource_manager.rb

@@ -152,12 +152,7 @@ module Avo
       def get_available_resources(user = nil)
         valid_resources
           .select do |resource|
-            resource.authorization.class.authorize(
-              user,
-              resource.model_class,
-              Avo.configuration.authorization_methods.stringify_keys["index"],
-              raise_exception: false
-            )
+            Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
           end
           .sort_by { |r| r.name }
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.0.pre19" unless const_defined?(:VERSION)
+  VERSION = "3.0.1.beta1" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -116,15 +116,6 @@ module Avo
       true
     end
 
-    # Mount all Avo engines
-    def mount_engines
-      -> {
-        mount Avo::DynamicFilters::Engine, at: "/avo-dynamic_filters" if defined?(Avo::DynamicFilters::Engine)
-        mount Avo::Dashboards::Engine, at: "/dashboards" if defined?(Avo::Dashboards::Engine)
-        mount Avo::Pro::Engine, at: "/avo-pro" if defined?(Avo::Pro::Engine)
-      }
-    end
-
     private
 
     def boot_logger