avo 3.30.4 → 4.0.0.beta.2

data/lib/avo/configuration.rb

@@ -23,11 +23,8 @@ module Avo
     attr_accessor :authenticate
     attr_accessor :current_user
     attr_accessor :id_links_to_resource
-    attr_accessor :full_width_container
-    attr_accessor :full_width_index_view
     attr_accessor :cache_resources_on_index_view
     attr_accessor :context
-    attr_accessor :display_breadcrumbs
     attr_accessor :hide_layout_when_printing
     attr_accessor :initial_breadcrumbs
     attr_accessor :home_path
@@ -36,7 +33,7 @@ module Avo
     attr_accessor :display_license_request_timeout_error
     attr_accessor :current_user_resource_name
     attr_accessor :raise_error_on_missing_policy
-    attr_writer :disabled_features
+    attr_accessor :global_search
     attr_accessor :buttons_on_form_footers
     attr_accessor :main_menu
     attr_accessor :profile_menu
@@ -59,6 +56,63 @@ module Avo
     attr_accessor :column_names_mapping
     attr_accessor :column_types_mapping
     attr_accessor :model_generator_hook
+    attr_accessor :send_metadata
+    attr_accessor :use_stacked_fields
+    attr_accessor :default_editor_url
+    attr_writer :body_classes
+    attr_accessor :sidebar_toggle_visible
+
+    unless defined?(CONTAINER_WIDTH_DEFAULTS)
+      CONTAINER_WIDTH_DEFAULTS = {
+        index: :large,
+        show: :small,
+        new: :small,
+        edit: :small,
+        create: :small,
+        update: :small
+      }.freeze
+
+      VALID_CONTAINER_WIDTHS = %i[full large small].freeze
+
+      CONTAINER_WIDTH_GROUPS = {
+        forms: %i[new edit create update],
+        display: %i[index show],
+        single: %i[show new edit create update]
+      }.freeze
+    end
+
+    def container_width=(value)
+      case value
+      when NilClass
+        @container_width = nil
+      when Symbol
+        raise ArgumentError, "Invalid container width: #{value}. Must be one of #{VALID_CONTAINER_WIDTHS}" unless VALID_CONTAINER_WIDTHS.include?(value)
+        @container_width = CONTAINER_WIDTH_DEFAULTS.transform_values { value }
+      when Hash
+        valid_keys = CONTAINER_WIDTH_DEFAULTS.keys + CONTAINER_WIDTH_GROUPS.keys
+        invalid_keys = value.keys.reject { |k| valid_keys.include?(k) }
+        raise ArgumentError, "Invalid container width keys: #{invalid_keys}. Valid keys: #{valid_keys}" if invalid_keys.any?
+
+        invalid_values = value.values.reject { |v| VALID_CONTAINER_WIDTHS.include?(v) }
+        raise ArgumentError, "Invalid container widths: #{invalid_values}" if invalid_values.any?
+
+        # Expand group aliases first
+        expanded_aliases = value
+          .select { |k, _| CONTAINER_WIDTH_GROUPS.key?(k) }
+          .each_with_object({}) do |(alias_key, width), result|
+            CONTAINER_WIDTH_GROUPS[alias_key].each { |view| result[view] = width }
+          end
+
+        # Specific keys win over group aliases
+        specific_keys = value.reject { |k, _| CONTAINER_WIDTH_GROUPS.key?(k) }
+
+        @container_width = CONTAINER_WIDTH_DEFAULTS.merge(expanded_aliases).merge(specific_keys)
+      end
+    end
+
+    def container_width
+      @container_width || CONTAINER_WIDTH_DEFAULTS
+    end
 
     def initialize
       @root_path = "/avo"
@@ -84,17 +138,14 @@ module Avo
         destroy: "destroy?"
       }
       @id_links_to_resource = false
-      @full_width_container = false
-      @full_width_index_view = false
       @cache_resources_on_index_view = Avo::PACKED
       @persistence = {
         driver: nil
       }
       @context = proc {}
       @initial_breadcrumbs = proc {
-        add_breadcrumb I18n.t("avo.home").humanize, avo.root_path
+        add_breadcrumb title: I18n.t("avo.home").humanize, path: avo.root_path, icon: "tabler/outline/home"
       }
-      @display_breadcrumbs = true
       @hide_layout_when_printing = false
       @home_path = nil
       @search_debounce = 300
@@ -102,7 +153,6 @@ module Avo
       @display_license_request_timeout_error = true
       @current_user_resource_name = "user"
       @raise_error_on_missing_policy = false
-      @disabled_features = []
       @buttons_on_form_footers = false
       @main_menu = nil
       @profile_menu = nil
@@ -117,7 +167,7 @@ module Avo
       @turbo = default_turbo
       @default_url_options = []
       @pagination = {}
-      @click_row_to_view_record = false
+      @click_row_to_view_record = true
       @alert_dismiss_time = 5000
       @is_admin_method = :is_admin?
       @is_developer_method = :is_developer?
@@ -128,7 +178,16 @@ module Avo
       @column_names_mapping = {}
       @column_types_mapping = {}
       @resource_row_controls_config = {}
+      @global_search = {
+        enabled: true,
+        navigation_section: true
+      }
       @model_generator_hook = true
+      @send_metadata = true
+      @use_stacked_fields = false
+      @default_editor_url = "cursor://file/%{path}"
+      @sidebar_toggle_visible = true
+      @body_classes = []
     end
 
     unless defined?(RESOURCE_ROW_CONTROLS_CONFIG_DEFAULTS)
@@ -183,14 +242,6 @@ module Avo
       @root_path
     end
 
-    def disabled_features
-      Avo::ExecutionContext.new(target: @disabled_features).handle
-    end
-
-    def feature_enabled?(feature)
-      !disabled_features.map(&:to_sym).include?(feature.to_sym)
-    end
-
     def branding
       Avo::Configuration::Branding.new(**@branding || {})
     end
@@ -199,30 +250,6 @@ module Avo
       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 clear_license_response_on_deploy=(value)
-      if Rails.env.development?
-        puts "[Avo DEPRECATION WARNING]: The `config.clear_license_response_on_deploy` configuration option is deprecated and will be removed in future versions. Please discontinue its use, no extra action is needed."
-      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
@@ -234,7 +261,7 @@ module Avo
       ).handle
     end
 
-    # When not in production or test we'll just use the FileStore which is good enough.
+    # When not in production we'll just use the FileStore which is good enough.
     # When running in production we'll use Rails.cache if it's not ActiveSupport::Cache::MemoryStore or ActiveSupport::Cache::NullStore.
     # If it's one of rejected cache stores, we'll use the FileStore.
     # We decided against the MemoryStore in production because it will not be shared between multiple processes (when using Puma).
@@ -248,8 +275,6 @@ module Avo
           else
             Rails.cache
           end
-        elsif Rails.env.test?
-          Rails.cache
         else
           file_store_instance
         end
@@ -299,10 +324,32 @@ module Avo
       @locale || I18n.default_locale
     end
 
+    # Known RTL (Right-to-Left) locale codes
+    RTL_LOCALES = %w[ar he fa ur yi ps sd ku ckb ug dv].freeze unless defined?(RTL_LOCALES)
+
+    # Check if the given locale is RTL
+    def self.rtl_locale?(locale = I18n.locale)
+      RTL_LOCALES.include?(locale.to_s.split("-").first.downcase)
+    end
+
+    # Check if the current locale is RTL
+    def rtl?
+      self.class.rtl_locale?(I18n.locale)
+    end
+
+    # Returns "rtl" or "ltr" based on current locale
+    def text_direction
+      rtl? ? "rtl" : "ltr"
+    end
+
     def explicit_authorization
       Avo::ExecutionContext.new(target: @explicit_authorization).handle
     end
 
+    def body_classes
+      Avo::ExecutionContext.new(target: @body_classes).handle
+    end
+
     def persistence
       Avo::ExecutionContext.new(target: @persistence).handle
     end

data/lib/avo/{cover_photo.rb → cover.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Avo
-  class CoverPhoto < PhotoObject
-    def key = :cover_photo
+  class Cover < PhotoObject
+    def key = :cover
 
     def size
       options.fetch(:size, :md)

data/lib/avo/current.rb

@@ -1,14 +1,3 @@
-begin
-  require "active_support/isolated_execution_state"
-rescue LoadError
-  # Older ActiveSupport versions may not expose this file directly.
-end
-require "active_support/current_attributes"
-begin
-  require "active_support/code_generator"
-rescue LoadError
-  # ActiveSupport 6.1 does not have this file.
-end
 class Avo::Current < ActiveSupport::CurrentAttributes
   attribute :app
   attribute :license

data/lib/avo/discreet_information.rb

@@ -1,8 +1,7 @@
-require "prop_initializer"
-require "action_view/helpers"
 class Avo::DiscreetInformation
   extend PropInitializer::Properties
   include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::DateHelper
 
   prop :resource, reader: :public
 
@@ -11,29 +10,31 @@ class Avo::DiscreetInformation
   def items
     Array.wrap(resource.class.discreet_information).map do |item|
       if item == :timestamps
-        timestamp_item(item, as: :text)
-      elsif item == :timestamps_badge
-        timestamp_item(item, as: :badge)
+        timestamps_item(item)
+      elsif item == :created_at
+        timestamp_item(item, key: :created_at)
+      elsif item == :updated_at
+        timestamp_item(item, key: :updated_at)
       elsif item == :id
-        id_item(item, as: :text)
-      elsif item == :id_badge
-        id_item(item, as: :badge)
+        id_item
       else
         parse_payload(item)
       end
-    end
+    end.flatten.compact
   end
 
   private
 
-  def id_item(item, as: :text)
-    DiscreetInformationItem.new(
-      label: "ID: #{record.id}",
-      as:
-    )
+  def id_item
+    {
+      value: record.id,
+      key: "ID",
+      as: :key_value
+    }
   end
 
-  def timestamp_item(item, as: :text)
+  def timestamps_item(item)
+    as = :icon
     return if record.created_at.blank? && record.updated_at.blank?
 
     time_format = "%Y-%m-%d %H:%M:%S"
@@ -47,12 +48,31 @@ class Avo::DiscreetInformation
     updated_at_tag = if record.updated_at.present?
       I18n.t("avo.updated_at_timestamp", updated_at:)
     end
-
-    DiscreetInformationItem.new(
-      tooltip: tag.div([created_at_tag, updated_at_tag].compact.join(tag.br), style: "text-align: right;"),
-      icon: "heroicons/outline/clock",
+    {
+      title: tag.div([created_at_tag, updated_at_tag].compact.join(tag.br), style: "text-align: right;"),
+      icon: "tabler/outline/calendar-time",
       as:
-    )
+    }
+  end
+
+  def timestamp_item(item, key: nil)
+    return if record[key].blank?
+
+    time_format = "%Y-%m-%d %H:%M:%S"
+    timestamp = record[key].strftime(time_format)
+
+    # Older versions of rails don't have the relative_time_in_words helper
+    value = if defined?(relative_time_in_words)
+      relative_time_in_words(record[key])
+    else
+      timestamp
+    end
+
+    {
+      value:,
+      key: I18n.t("avo.#{key}"),
+      as: :key_value,
+    }
   end
 
   def parse_payload(item)
@@ -64,17 +84,20 @@ class Avo::DiscreetInformation
       view:
     }
 
-    DiscreetInformationItem.new(
-      tooltip: Avo::ExecutionContext.new(target: item[:tooltip], **args).handle,
+    visible = item[:visible].nil? || Avo::ExecutionContext.new(target: item[:visible], **args).handle
+
+    return unless visible
+
+    {
+      title: Avo::ExecutionContext.new(target: item[:title], **args).handle,
       icon: Avo::ExecutionContext.new(target: item[:icon], **args).handle,
       url: Avo::ExecutionContext.new(target: item[:url], **args).handle,
-      url_target: Avo::ExecutionContext.new(target: item[:url_target], **args).handle,
+      target: Avo::ExecutionContext.new(target: item[:target], **args).handle,
       data: Avo::ExecutionContext.new(target: item[:data], **args).handle,
-      label: Avo::ExecutionContext.new(target: item[:label], **args).handle,
-      as: Avo::ExecutionContext.new(target: item[:as], **args).handle,
-      visible: Avo::ExecutionContext.new(target: item[:visible], **args).handle
-    )
+      text: Avo::ExecutionContext.new(target: item[:text], **args).handle,
+      key: Avo::ExecutionContext.new(target: item[:key], **args).handle,
+      value: Avo::ExecutionContext.new(target: item[:value], **args).handle,
+      as: Avo::ExecutionContext.new(target: item[:as], **args).handle
+    }
   end
-
-  DiscreetInformationItem = Struct.new(:tooltip, :icon, :url, :url_target, :data, :label, :as, :visible, keyword_init: true) unless defined?(DiscreetInformationItem)
 end

data/lib/avo/dsl/field_parser.rb

@@ -76,7 +76,7 @@ module Avo
           field[:name].to_s == symbol.to_s
         end
 
-        return matched_field[:class] if matched_field.present? && matched_field[:class].present?
+        matched_field[:class] if matched_field.present? && matched_field[:class].present?
       end
     end
   end

data/lib/avo/engine.rb

@@ -18,10 +18,27 @@ Gem.loaded_specs["avo"].dependencies.each do |d|
   end
 end
 
+# Check for avo-licensing as a transitive dependency
+# This handles cases where avo-licensing is a dependency of other avo gems
+if Gem.loaded_specs.key?("avo-licensing") && !defined?(Avo::Licensing)
+  require "avo/licensing"
+end
+
 module Avo
   class Engine < ::Rails::Engine
     isolate_namespace Avo
 
+    rake_tasks do
+      # Ensure Avo tasks are loaded
+      load File.expand_path("../tasks/avo_tasks.rake", __dir__)
+
+      if ENV["BUILD_AVO_ASSETS"] == "true"
+        if Rake::Task.task_defined?("assets:precompile")
+          Rake::Task["assets:precompile"].enhance(["avo:build"])
+        end
+      end
+    end
+
     config.after_initialize do
       # Reset before reloads in development
       ::Avo.asset_manager.reset
@@ -40,7 +57,7 @@ module Avo
       # 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
-      engine_avo_directory = Avo::Engine.root.join("app", "avo").to_s
+      engine_avo_directory = Engine.root.join("app", "avo").to_s
 
       [avo_directory, engine_avo_directory].each do |directory_path|
         ActiveSupport::Dependencies.autoload_paths.delete(directory_path)
@@ -81,7 +98,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 Engine.root.join("spec", "testing_helpers")
       end
     end
 
@@ -89,11 +106,27 @@ module Avo
       app.config.debug_exception_response_format = :api
     end
 
-    config.app_middleware.use(
-      Rack::Static,
-      urls: ["/avo-assets"],
-      root: Avo::Engine.root.join("public")
-    )
+    initializer "avo.assets-importmaps", before: "importmap" do |app|
+      if app.respond_to?(:importmap)
+        app.config.importmap.paths << Engine.root.join("config/importmap.rb")
+      end
+    end
+
+    initializer "avo.assets" do |app|
+      if app.config.respond_to?(:assets)
+        # Add Avo's assets to the asset pipeline
+        app.config.assets.paths << Engine.root.join("app", "assets", "builds").to_s
+        app.config.assets.paths << Engine.root.join("app", "assets", "images").to_s
+        app.config.assets.paths << Engine.root.join("app", "assets", "svgs").to_s
+        # Expose the fonts directory to sprockets
+        app.config.assets.paths << Engine.root.join("app", "assets", "images", "avo").to_s
+
+        if defined?(::Sprockets)
+          # Tell sprockets where your assets are located
+          app.config.assets.precompile += %w[avo_manifest.js]
+        end
+      end
+    end
 
     config.generators do |g|
       g.test_framework :rspec, view_specs: false
@@ -105,7 +138,7 @@ module Avo
     end
 
     initializer "avo.locales" do |app|
-      I18n.load_path += Dir[Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "*.{rb,yml}")]
+      I18n.load_path += Dir[Engine.root.join("lib", "generators", "avo", "templates", "locales", "*.{rb,yml}")]
     end
   end
 end

data/lib/avo/error_manager.rb

@@ -15,7 +15,7 @@ module Avo
     end
 
     def add(error)
-      @errors << error
+      @errors << error unless @errors.include?(error)
     end
 
     def has_errors?

data/lib/avo/fields/avatar_field.rb

@@ -0,0 +1,19 @@
+module Avo
+  module Fields
+    class AvatarField < BaseField
+      def initialize(id, **args, &block)
+        only_on :index
+
+        super
+      end
+
+      def table_header_label
+        @args[:name] || nil
+      end
+
+      def table_header_class
+        "w-16"
+      end
+    end
+  end
+end

data/lib/avo/fields/badge_field.rb

@@ -4,17 +4,37 @@ module Avo
       attr_reader :options
 
       def initialize(id, **args, &block)
-        super(id, **args, &block)
+        super
 
         hide_on [:edit, :new]
 
-        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, neutral: :neutral}
-        @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
+        @options = args[:options] || {}
+        @style = args[:style]
+        @icon = args[:icon]
       end
 
       def options_for_filter
         @options.values.flatten.uniq
       end
+
+      # Maps field value to a color based on @options configuration
+      # Example: "Done" -> "success" if options = { success: [:done, :complete] }
+      def color
+        return "neutral" if value.blank?
+
+        values = @options.find do |_, configured_values|
+          Array.wrap(configured_values).map { |v| v.to_s }.include?(value.to_s)
+        end
+        values&.first&.to_s || "neutral"
+      end
+
+      def style
+        execute_context(@style) || "subtle"
+      end
+
+      def icon
+        execute_context(@icon)
+      end
     end
   end
 end

data/lib/avo/fields/base_field.rb

@@ -16,6 +16,7 @@ module Avo
       include Avo::Fields::Concerns::IsDisabled
       include Avo::Fields::Concerns::IsRequired
       include Avo::Fields::Concerns::UseViewComponents
+      include Avo::Fields::Concerns::DomId
 
       include ActionView::Helpers::UrlHelper
 
@@ -44,8 +45,10 @@ module Avo
       attr_reader :format_form_using
       attr_reader :autocomplete
       attr_reader :help
+      attr_reader :label_help
       attr_reader :default
       attr_reader :stacked
+      attr_reader :size
       attr_reader :for_presentation_only
       attr_reader :for_attribute
 
@@ -60,6 +63,7 @@ module Avo
       attr_accessor :action
       attr_accessor :user
       attr_accessor :panel_name
+      attr_accessor :width
 
       class_attribute :field_name_attribute
 
@@ -94,12 +98,14 @@ module Avo
         @placeholder = args[:placeholder]
         @autocomplete = args[:autocomplete]
         @help = args[:help]
+        @label_help = args[:label_help]
         @default = args[:default]
         @visible = args[:visible]
         @html = args[:html]
         @view = Avo::ViewInquirer.new(args[:view])
         @value = args[:value]
         @stacked = args[:stacked]
+        @size = args[:size] || :md
         @for_presentation_only = args[:for_presentation_only] || false
         @resource = args[:resource]
         @action = args[:action]
@@ -107,6 +113,8 @@ module Avo
         @for_attribute = args[:for_attribute]
         @meta = args[:meta]
         @copyable = args[:copyable] || false
+        @react_on = Array.wrap(args[:react_on]).map(&:to_s)
+        @record = args[:record]
 
         @args = args
 
@@ -114,9 +122,19 @@ module Avo
         @computed = block.present?
         @computed_value = nil
 
+        @width = args[:width] || 100
+
+        if width_option.present? && width_option != 100
+          @stacked = true
+        end
+
         post_initialize if respond_to?(:post_initialize)
       end
 
+      def width_option
+        @width_option ||= execute_context(@width)
+      end
+
       def translation_key
         @translation_key || "avo.field_translations.#{@id}"
       end
@@ -129,6 +147,25 @@ module Avo
         t(translation_key, count: 2, default: default).humanize
       end
 
+      def width_class
+        case width_option
+        when 25
+          "w-1/4"
+        when 33
+          "w-1/3"
+        when 50
+          "w-1/2"
+        when 66
+          "w-2/3"
+        when 75
+          "w-3/4"
+        when 100
+          "w-full"
+        else
+          "w-full"
+        end
+      end
+
       # Getting the name of the resource (user/users, post/posts)
       # We'll first check to see if the user passed a name
       # Secondly we'll try to find a translation key
@@ -136,6 +173,8 @@ module Avo
       def name
         if custom_name?
           Avo::ExecutionContext.new(target: @name).handle
+        elsif name_override.present?
+          name_override
         elsif translation_key
           translated_name default: default_name
         else
@@ -143,6 +182,8 @@ module Avo
         end
       end
 
+      def name_override = nil
+
       def plural_name
         default = name.pluralize
 
@@ -157,6 +198,10 @@ module Avo
         @table_header_label ||= name
       end
 
+      def table_header_class
+        @table_header_class ||= ""
+      end
+
       def custom_name?
         !@name.nil?
       end
@@ -169,7 +214,7 @@ module Avo
         Avo::ExecutionContext.new(target: @placeholder || name, record: record, resource: @resource, view: @view).handle
       end
 
-      def attribute_id = (@attribure_id ||= @for_attribute || @id)
+      def attribute_id = (@attribute_id ||= @for_attribute || @id)
 
       def value(property = nil)
         return @value if @value.present?

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

@@ -0,0 +1,17 @@
+module Avo
+  module Fields
+    module Concerns
+      module DomId
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def param_key = to_s.underscore
+        end
+
+        def to_key = [@id]
+
+        def model_name = self.class
+      end
+    end
+  end
+end