avo 3.0.0.pre18 → 3.0.0.pre19

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}
+        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, neutral: :neutral}
         @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end

data/lib/avo/fields/base_field.rb

@@ -7,6 +7,7 @@ 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
@@ -14,6 +15,7 @@ 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
 
@@ -73,11 +75,12 @@ module Avo
         @visible = args[:visible]
         @as_avatar = args[:as_avatar] || false
         @html = args[:html] || nil
-        @view = args[:view] || nil
+        @view = Avo::ViewInquirer.new(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
 
@@ -155,14 +158,7 @@ module Avo
 
         # Run computable callback block if present
         if computable && block.present?
-          final_value = Avo::ExecutionContext.new(
-            target: block,
-            record: record,
-            resource: @resource,
-            view: @view,
-            field: self,
-            include: self.class.included_modules
-          ).handle
+          final_value = execute_block
         end
 
         # Run the value through resolver if present
@@ -181,6 +177,17 @@ 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
@@ -192,7 +199,8 @@ module Avo
             key: key,
             value: value,
             resource: resource,
-            field: self
+            field: self,
+            include: self.class.included_modules
           ).handle
         end
 
@@ -220,35 +228,8 @@ 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
-        return {} if record.nil?
-
-        record.errors
+        record.nil? ? {} : record.errors
       end
 
       def type
@@ -289,11 +270,7 @@ module Avo
       private
 
       def model_or_class(model)
-        if model.instance_of?(String)
-          "class"
-        else
-          "model"
-        end
+        model.instance_of?(String) ? "class" : "model"
       end
 
       def is_model?(model)
@@ -305,7 +282,7 @@ module Avo
       end
 
       def on_create?
-        @view.in?([:new, :create])
+        @view.in?(%w[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,6 +13,8 @@ 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/concerns/use_view_components.rb

@@ -0,0 +1,45 @@
+module Avo
+  module Fields
+    module Concerns
+      module UseViewComponents
+        extend ActiveSupport::Concern
+
+        included do
+          attr_reader :components
+        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]
+
+          custom_components = Avo::ExecutionContext.new(
+            target: components,
+            resource: @resource,
+            record: @record,
+            view: view
+          ).handle
+
+          component_class = custom_components.dig("#{view}_component".to_sym) || "#{view_component_namespace}::#{view.to_s.camelize}Component"
+          component_class.to_s.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
+      end
+    end
+  end
+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_resource
+      attr_reader :link_to_record
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : 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_resource
+      attr_accessor :link_to_record
       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_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : 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_resource
+      attr_reader :link_to_record
       attr_reader :rounded
       attr_reader :size
       attr_reader :default
@@ -16,7 +16,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : 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 = :index)
-        view = :show if view.in? [:new, :create, :update, :edit]
+      def component_for_view(view = Avo::ViewInquirer.new("index"))
+        view = Avo::ViewInquirer.new("show") if view.in? %w[new create update edit]
 
         super view
       end

data/lib/avo/fields/heading_field.rb

@@ -4,35 +4,27 @@ 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(content, **args, &block)
+        super(id, **args, &block)
 
         # this field is not used to update anything
         @for_presentation_only = true
 
         hide_on :index
 
-        @as_html = args[:as_html].present? ? args[:as_html] : false
+        @as_html = args[:as_html].presence || false
       end
 
       def id
         "heading_#{name.to_s.parameterize.underscore}"
       end
 
-      # Override the value method if the field is empty
       def value
-        return nil if empty
-
-        super
+        block.present? ? execute_block : @label
       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_resource
+      attr_reader :link_to_record
 
       def initialize(id, **args, &block)
         args[:readonly] = true
@@ -12,7 +12,7 @@ module Avo
 
         add_boolean_prop args, :sortable, true
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
       end
     end
   end

data/lib/avo/fields/status_field.rb

@@ -6,13 +6,15 @@ 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 = "success"
+        status = "neutral"
         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_resource
+      attr_reader :link_to_record
       attr_reader :as_html
       attr_reader :protocol
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        add_boolean_prop args, :link_to_resource
+        add_boolean_prop args, :link_to_record
         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 curent_user
+      def current_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 curent_user
+  def current_user
     Avo::Current.user
   end
 

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"
+        when "pro", "advanced"
           ProLicense.new @hq_response
         else
           NilLicense.new @hq_response

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

@@ -56,12 +56,6 @@ 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::IsVisible
+  include Avo::Concerns::VisibleItems
   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 = view
+    @view = Avo::ViewInquirer.new 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::IsVisible
+  include Avo::Concerns::VisibleItems
 
   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 = view
+    @view = Avo::ViewInquirer.new view
     @items_holder = Avo::Resources::Items::Holder.new
   end
 
   def hydrate(view: nil, resource: nil, **args)
-    @view = view
+    @view = Avo::ViewInquirer.new 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 = view
+    @view = Avo::ViewInquirer.new 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::IsVisible
+  include Avo::Concerns::VisibleItems
   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 = view
+    @view = Avo::ViewInquirer.new 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 = view
+    @view = Avo::ViewInquirer.new view
     @style = style
     @args = args
 

data/lib/avo/resources/resource_manager.rb

@@ -152,7 +152,12 @@ module Avo
       def get_available_resources(user = nil)
         valid_resources
           .select do |resource|
-            Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
+            resource.authorization.class.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.pre18" unless const_defined?(:VERSION)
+  VERSION = "3.0.0.pre19" unless const_defined?(:VERSION)
 end

data/lib/avo/view_inquirer.rb

@@ -0,0 +1,36 @@
+# Allows to check the the view type by using `view.index?` or `view.edit?` etc...
+# It also allows to check if the view is a form or a display view by using `view.form?` or `view.display?`
+module Avo
+  class ViewInquirer < ActiveSupport::StringInquirer
+    DISPLAY_VIEWS = %w[index show]
+    FORM_VIEWS = %w[new edit]
+
+    def initialize(view)
+      super(view.to_s)
+
+      @display = in? DISPLAY_VIEWS
+      @form = in? FORM_VIEWS
+    end
+
+    def display?
+      @display
+    end
+
+    def form?
+      @form
+    end
+
+    # To avoid breaking changes we allow the comparison with symbols
+    def ==(other)
+      if other.is_a? Symbol
+        to_sym == other
+      else
+        super(other)
+      end
+    end
+
+    def in?(another_object)
+      super another_object.map(&:to_s)
+    end
+  end
+end

data/lib/avo.rb

@@ -116,6 +116,15 @@ 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

data/lib/generators/avo/concerns/parent_controller.rb

@@ -0,0 +1,20 @@
+module Generators
+  module Avo
+    module Concerns
+      module ParentController
+        extend ActiveSupport::Concern
+
+        included do
+          class_option "parent-controller",
+            desc: "The name of the parent controller.",
+            type: :string,
+            required: false
+        end
+
+        def parent_controller
+          options["parent-controller"] || ::Avo.configuration.resource_parent_controller
+        end
+      end
+    end
+  end
+end

data/lib/generators/avo/controller_generator.rb

@@ -1,8 +1,11 @@
 require_relative "named_base_generator"
+require_relative "concerns/parent_controller"
 
 module Generators
   module Avo
     class ControllerGenerator < NamedBaseGenerator
+      include Generators::Avo::Concerns::ParentController
+
       source_root File.expand_path("templates", __dir__)
 
       namespace "avo:controller"