avo 2.16.1.pre.1.nativefields → 2.17.1.pre.1.zeitwerk.eager.load.dir

data/lib/avo/base_resource.rb

@@ -101,6 +101,32 @@ module Avo
 
         ordering.dig(:actions) || {}
       end
+
+      def get_record_associations(record)
+        record._reflections
+      end
+
+      def valid_association_name(record, association_name)
+        get_record_associations(record).keys.find do |name|
+          name == association_name
+        end
+      end
+
+      def valid_attachment_name(record, association_name)
+        get_record_associations(record).keys.each do |name|
+          return association_name if name == "#{association_name}_attachment" || name == "#{association_name}_attachments"
+        end
+      end
+
+      def get_available_models
+        ApplicationRecord.descendants
+      end
+
+      def valid_model_class(model_class)
+        get_available_models.find do |m|
+          m.to_s == model_class.to_s
+        end
+      end
     end
 
     def initialize

data/lib/avo/concerns/fetches_things.rb

@@ -36,7 +36,7 @@ module Avo
           possible_resource = "#{resource}Resource".gsub "ResourceResource", "Resource"
 
           resources.find do |available_resource|
-            possible_resource.safe_constantize == available_resource.class
+            possible_resource.to_s == available_resource.class.to_s
           end
         end
 

data/lib/avo/concerns/has_fields.rb

@@ -43,6 +43,12 @@ module Avo
 
           items_holder.heading body, **args
         end
+
+        def sidebar(**args, &block)
+          ensure_items_holder_initialized
+
+          items_holder.sidebar Avo::SidebarBuilder.parse_block(**args, &block)
+        end
         # END DSL methods
 
         def items
@@ -76,6 +82,11 @@ module Avo
                   fields << extract_fields_from_items(tab)
                 end
               end
+
+              # Dive into sidebar to fetch their fields
+              if item.is_sidebar?
+                fields << extract_fields_from_items(item)
+              end
             end
 
             if item.is_field?
@@ -277,6 +288,17 @@ module Avo
           end
         end
 
+        # Make sure all tabs panelfull_items are setted as inside tabs
+        panelfull_items.grep(Avo::TabGroup).each do |tab_group|
+          tab_group.items.grep(Avo::Tab).each do |tab|
+            tab.items.grep(Avo::Panel).each do |panel|
+              panel.items.grep(Avo::Fields::BelongsToField).each do |field|
+                field.target = :_top
+              end
+            end
+          end
+        end
+
         # Add all the panelles fields to a new panel
         main_panel_holder = Avo::ItemsHolder.new
         main_panel_holder.items = panelless_items

data/lib/avo/concerns/is_resource_item.rb

@@ -31,6 +31,10 @@ module Avo
       def is_tab_group?
         self.class.item_type == :tab_group
       end
+
+      def is_sidebar?
+        self.class.item_type == :sidebar
+      end
     end
   end
 end

data/lib/avo/configuration/branding.rb

@@ -1,9 +1,10 @@
 class Avo::Configuration::Branding
-  def initialize(colors: nil, chart_colors: nil, logo: nil, logomark: nil)
+  def initialize(colors: nil, chart_colors: nil, logo: nil, logomark: nil, placeholder: nil)
     @colors = colors || {}
     @chart_colors = chart_colors
     @logo = logo
     @logomark = logomark
+    @placeholder = placeholder
 
     @default_colors = {
       background: "#F6F6F7",
@@ -15,6 +16,7 @@ class Avo::Configuration::Branding
     @default_chart_colors = ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"]
     @default_logo = "/avo-assets/logo.png"
     @default_logomark = "/avo-assets/logomark.png"
+    @default_placeholder = "placeholder.svg"
   end
 
   def css_colors
@@ -39,6 +41,12 @@ class Avo::Configuration::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)
 

data/lib/avo/dynamic_router.rb

@@ -1,21 +1,25 @@
 module Avo
-  module DynamicRouter
-    def self.routes(router)
-      Rails.application.eager_load! unless Rails.env.production?
+  class DynamicRouter
+    def self.routes
+      Avo::Engine.routes.draw do
+        scope "resources", as: "resources" do
+          Avo::App.eager_load_resources
 
-      BaseResource.descendants
-        .select do |resource|
-          resource != :BaseResource
-        end
-        .select do |resource|
-          resource.is_a? Class
-        end
-        # .select do |resource|
-        #   resource.model_class.present?
-        # end
-        .map do |resource|
-          router.resources resource.new.route_key
+          BaseResource.descendants
+            .select do |resource|
+              resource != :BaseResource
+            end
+            .select do |resource|
+              resource.is_a? Class
+            end
+            # .select do |resource|
+            #   resource.model_class.present?
+            # end
+            .map do |resource|
+              resources resource.new.route_key
+            end
         end
+      end
     end
   end
 end

data/lib/avo/engine.rb

@@ -17,6 +17,15 @@ module Avo
       ::Avo::App.boot
     end
 
+    # initializer "eager load resources" do |app|
+    #   # puts ["app.root->", app.root.join('app', 'avo', 'resources')].inspect
+    #   app.config.to_prepare do
+    #     puts ["app.config.to_prepare->", app.root.join('app', 'avo', 'resources')].inspect
+    #     Rails.autoloaders.main.eager_load_dir(app.root.join('app', 'avo', 'resources'))
+    #     puts [".to_prepare BaseResource.descendants->", BaseResource.descendants].inspect
+    #   end
+    # end
+
     initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],

data/lib/avo/fields/belongs_to_field.rb

@@ -58,6 +58,8 @@ module Avo
     # - is_disabled?
 
     class BelongsToField < BaseField
+      attr_accessor :target
+
       attr_reader :polymorphic_as
       attr_reader :relation_method
       attr_reader :types # for Polymorphic associations
@@ -77,6 +79,7 @@ module Avo
         @allow_via_detaching = args[:allow_via_detaching] == true
         @attach_scope = args[:attach_scope]
         @polymorphic_help = args[:polymorphic_help]
+        @target = args[:target]
       end
 
       def searchable

data/lib/avo/fields/heading_field.rb

@@ -1,9 +1,17 @@
+require 'securerandom'
+
 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
+
         args[:updatable] = false
 
         super(content, **args, &block)
@@ -16,6 +24,13 @@ module Avo
       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
+      end
     end
   end
 end

data/lib/avo/items_holder.rb

@@ -55,6 +55,10 @@ module Avo
       add_item field
     end
 
+    def sidebar(instance)
+      add_item instance
+    end
+
     def add_item(instance)
       @items << instance
 

data/lib/avo/licensing/pro_license.rb

@@ -17,6 +17,7 @@ module Avo
           :stimulus_js_integration,
           :resource_show_controls,
           :branding,
+          :resource_sidebar,
           :advanced_fields
         ]
       end

data/lib/avo/menu/builder.rb

@@ -57,7 +57,7 @@ class Avo::Menu::Builder
   # Add all the resources
   def all_resources(**args)
     Avo::App.resources_for_navigation.each do |res|
-      resource res.model_class, **args
+      resource res.route_key, **args
     end
   end
 

data/lib/avo/menu/menu.rb

@@ -1,4 +1,2 @@
 class Avo::Menu::Menu < OpenStruct
-
-
 end

data/lib/avo/reloader.rb

@@ -20,40 +20,41 @@ class Avo::Reloader
   end
 
   private
-    def updater
-      @updater ||= config.file_watcher.new(files, directories) { reload! }
-    end
 
-    def files
-      # we want to watch some files no matter what
-      paths = [
-        Rails.root.join("config", "initializers", "avo.rb"),
-      ]
+  def updater
+    @updater ||= config.file_watcher.new(files, directories) { reload! }
+  end
 
-      # we want to watch some files only in Avo development
-      if reload_lib?
-        paths += []
-      end
+  def files
+    # we want to watch some files no matter what
+    paths = [
+      Rails.root.join("config", "initializers", "avo.rb"),
+    ]
 
-      paths
+    # we want to watch some files only in Avo development
+    if reload_lib?
+      paths += []
     end
 
-    def directories
-      dirs = {}
+    paths
+  end
 
-      # watch the lib directory in Avo development
-      if reload_lib?
-        dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
-      end
+  def directories
+    dirs = {}
 
-      dirs
+    # watch the lib directory in Avo development
+    if reload_lib?
+      dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
     end
 
-    def config
-      Rails.application.config
-    end
+    dirs
+  end
 
-    def reload_lib?
-      Avo::IN_DEVELOPMENT || ENV['AVO_RELOAD_LIB_DIR']
-    end
+  def config
+    Rails.application.config
+  end
+
+  def reload_lib?
+    Avo::IN_DEVELOPMENT || ENV["AVO_RELOAD_LIB_DIR"]
+  end
 end

data/lib/avo/services/authorization_service.rb

@@ -49,10 +49,15 @@ module Avo
           return model if skip_authorization || user.nil?
 
           begin
-            if policy_class
-              policy_class::Scope.new(user, model).resolve
+            # Try and figure out the scope from a given policy or auto-detected one
+            scope_from_policy_class = scope_for_policy_class(policy_class)
+
+            # If we discover one use it.
+            # Else fallback to pundit.
+            if scope_from_policy_class.present?
+              scope_from_policy_class.new(user, model).resolve
             else
-              Pundit.policy_scope! user, model
+              Pundit.policy_scope!(user, model)
             end
           rescue Pundit::NotDefinedError => e
             return model unless Avo.configuration.raise_error_on_missing_policy
@@ -88,6 +93,15 @@ module Avo
             raise error
           end
         end
+
+        # Fetches the scope for a given policy
+        def scope_for_policy_class(policy_class = nil)
+          return if policy_class.blank?
+
+          if policy_class.present? && defined?(policy_class::Scope)
+            policy_class::Scope
+          end
+        end
       end
 
       def initialize(user = nil, record = nil, policy_class: nil)

data/lib/avo/services/encryption_service.rb

@@ -40,7 +40,7 @@ module Avo
       end
 
       def secret_key_base
-        ENV['SECRET_KEY_BASE'] || Rails.application.credentials.secret_key_base || Rails.application.secrets.secret_key_base
+        ENV["SECRET_KEY_BASE"] || Rails.application.credentials.secret_key_base || Rails.application.secrets.secret_key_base
       end
     end
   end

data/lib/avo/sidebar.rb

@@ -0,0 +1,60 @@
+class Avo::Sidebar
+  include Avo::Concerns::IsResourceItem
+  include Avo::Fields::FieldExtensions::VisibleInDifferentViews
+
+  class_attribute :item_type, default: :sidebar
+  delegate :items, :add_item, to: :items_holder
+
+  attr_reader :name
+  attr_reader :view
+  attr_accessor :items_holder
+
+  def initialize(name: nil, view: nil, **args)
+    # Initialize the visibility markers
+    super
+
+    @name = name
+    @items_holder = Avo::ItemsHolder.new
+    @view = view
+
+    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
+
+  def hydrate(view: nil)
+    @view = view
+
+    self
+  end
+
+  def empty?
+    visible_items.blank?
+  end
+
+  def items
+    if self.items_holder.present?
+      self.items_holder.items
+    else
+      []
+    end
+  end
+
+  def visible_items
+    items.map do |item|
+      # Remove the fields that shouldn't be visible in this view
+      # eg: has_many fields on edit
+      if not_visible_field(item)
+        nil
+      else
+        item
+      end
+    end
+    .compact
+  end
+
+  def not_visible_field(item)
+    item.is_field? && !item.visible_on?(view)
+  end
+end

data/lib/avo/sidebar_builder.rb

@@ -0,0 +1,24 @@
+class Avo::SidebarBuilder
+  class << self
+    def parse_block(**args, &block)
+      Docile.dsl_eval(new(**args), &block).build
+    end
+  end
+
+  attr_reader :items_holder
+
+  delegate :field, to: :items_holder
+  delegate :items, to: :items_holder
+  delegate :heading, to: :items_holder
+
+  def initialize(name: nil, **args)
+    @sidebar = Avo::Sidebar.new(**args)
+    @items_holder = Avo::ItemsHolder.new
+  end
+
+  # Fetch the sidebar
+  def build
+    @sidebar.items_holder = @items_holder
+    @sidebar
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.16.1.pre.1.nativefields" unless const_defined?(:VERSION)
+  VERSION = "2.17.1.pre.1.zeitwerk.eager.load.dir" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/field/components/index_component.html.erb.tt

@@ -1,3 +1,3 @@
-<%%= index_field_wrapper field: @field, resource: @resource do %>
+<%%= index_field_wrapper **field_wrapper_args do %>
   <%%= @field.value %>
 <%% end %>

data/lib/generators/avo/templates/initializer/avo.tt

@@ -35,7 +35,7 @@ Avo.configure do |config|
   # config.locale = 'en-US'
 
   ## == Resource options ==
-  # config.resource_controls = :right
+  # config.resource_controls_placement = :right
   # config.model_resource_mapping = {}
   # config.default_view_type = :table
   # config.per_page = 24
@@ -71,6 +71,7 @@ Avo.configure do |config|
   #   chart_colors: ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"],
   #   logo: "/avo-assets/logo.png",
   #   logomark: "/avo-assets/logomark.png"
+  #   placeholder: "/avo-assets/placeholder.svg"
   # }
 
   ## == Breadcrumbs ==