avo 3.30.4 → 4.0.0.beta.2

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

@@ -20,6 +20,10 @@ module Avo
           authorize_file_action(:download)
         end
 
+        def can_reupload_file?
+          # TODO: Implement this when we have the reupload action
+        end
+
         private
 
         def authorize_file_action(action)

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

@@ -56,7 +56,7 @@ module Avo
         end
 
         def default_attribute_value(name)
-          (name == :data) ? {} : nil
+          (name == :data) ? {} : ""
         end
 
         def add_action_data_attributes(attributes, name, element)

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

@@ -4,11 +4,8 @@ module Avo
       module IsSearchable
         extend ActiveSupport::Concern
 
-        def is_searchable?
-          return false unless defined?(Avo::Pro)
-
-          @searchable && Avo.license.has_with_trial(:searchable_associations)
-        end
+        # Don't remove, avo-pro hooks into this method to check if the field is searchable.
+        def is_searchable? = false
       end
     end
   end

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

@@ -27,7 +27,7 @@ module Avo
         def component_for_view(view = Avo::ViewInquirer.new("index"))
           view = Avo::ViewInquirer.new(view)
 
-          nested_on?(view) ? Avo::Fields::Common::NestedFieldComponent : super(view)
+          nested_on?(view) ? Avo::Fields::Common::NestedFieldComponent : super
         end
 
         def nested_on?(view)

data/lib/avo/fields/files_field.rb

@@ -10,13 +10,13 @@ module Avo
       attr_reader :hide_view_type_switcher
 
       def initialize(id, **args, &block)
-        super(id, **args, &block)
+        super
 
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
         @accept = args[:accept].present? ? args[:accept] : nil
-        @display_filename = args[:display_filename].nil? ? true : args[:display_filename]
+        @display_filename = args[:display_filename].nil? || args[:display_filename]
         @view_type = args[:view_type] || :grid
         @hide_view_type_switcher = args[:hide_view_type_switcher]
       end

data/lib/avo/fields/frame_base_field.rb

@@ -7,7 +7,7 @@ module Avo
       include Avo::Concerns::HasDescription
 
       def initialize(id, **args, &block)
-        super(id, **args, &block)
+        super
 
         @use_resource = args[:use_resource]
         @reloadable = args[:reloadable]
@@ -73,7 +73,7 @@ module Avo
       def component_for_view(view = Avo::ViewInquirer.new("index"))
         view = Avo::ViewInquirer.new("show") if view.in? %w[new create update edit]
 
-        super(view)
+        super
       end
 
       def authorized?

data/lib/avo/fields/id_field.rb

@@ -8,12 +8,16 @@ module Avo
 
         hide_on :forms
 
-        super(id, **args, &block)
+        super
 
         add_boolean_prop args, :sortable, true
 
         @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
       end
+
+      def name_override
+        "ID"
+      end
     end
   end
 end

data/lib/avo/fields/progress_bar_field.rb

@@ -7,7 +7,7 @@ module Avo
       attr_reader :value_suffix
 
       def initialize(name, **args, &block)
-        super(name, **args, &block)
+        super
 
         @max = args[:max] || 100
         @step = args[:step] || 1

data/lib/avo/fields/text_field.rb

@@ -6,7 +6,7 @@ module Avo
       attr_reader :protocol
 
       def initialize(id, **args, &block)
-        super(id, **args, &block)
+        super
 
         add_boolean_prop args, :link_to_record
         add_boolean_prop args, :as_html

data/lib/avo/photo_object.rb

@@ -20,7 +20,18 @@ class Avo::PhotoObject
     return unless options.fetch(:source, nil).present?
 
     if options[:source].is_a?(Symbol)
-      record.send(options[:source])
+      return unless record.present?
+      return if record.new_record?
+
+      value = record.send(options[:source])
+
+      # On edit view, prefer the persisted attachment to avoid rendering
+      # temporary/unpersisted direct-upload values after a failed update.
+      if value.instance_of?(ActiveStorage::Attached::One) && view&.edit?
+        value = @resource.find_record(record.to_param).send(options[:source])
+      end
+
+      value
     elsif options[:source].respond_to?(:call)
       Avo::ExecutionContext.new(target: options[:source], record:, resource: @resource, view:).handle
     end

data/lib/avo/plugin_manager.rb

@@ -19,6 +19,10 @@ module Avo
       @plugins << Plugin.new(name:, priority: priority)
     end
 
+    def register_view_type(name, component:, icon:, active_icon:, translation_key: nil)
+      Avo.view_type_manager.register(name, component:, icon:, active_icon:, translation_key:)
+    end
+
     def register_field(method_name, klass)
       # Avo.boot method is executed multiple times.
       # During the first run, it correctly loads descendants of Avo::Fields::Base.

data/lib/avo/resources/base.rb

@@ -11,8 +11,8 @@ module Avo
       include Avo::Concerns::HasResourceStimulusControllers
       include Avo::Concerns::ModelClassConstantized
       include Avo::Concerns::HasDescription
-      include Avo::Concerns::HasCoverPhoto
-      include Avo::Concerns::HasProfilePhoto
+      include Avo::Concerns::HasCover
+      include Avo::Concerns::HasAvatar
       include Avo::Concerns::HasHelpers
       include Avo::Concerns::Hydration
       include Avo::Concerns::Pagination
@@ -53,7 +53,8 @@ module Avo
       attr_accessor :record
 
       class_attribute :id, default: :id
-      class_attribute :title
+      class_attribute :title # TODO: extract this to HasTitle concern
+      class_attribute :icon
       class_attribute :search, default: {}
       class_attribute :includes, default: []
       class_attribute :attachments, default: []
@@ -109,18 +110,6 @@ module Avo
         delegate :t, to: ::I18n
         delegate :context, to: ::Avo::Current
 
-        def action(action_class, arguments: {})
-          deprecated_dsl_api __method__, "actions"
-        end
-
-        def filter(filter_class, arguments: {})
-          deprecated_dsl_api __method__, "filters"
-        end
-
-        def scope(scope_class)
-          deprecated_dsl_api __method__, "scopes"
-        end
-
         # This resolves the scope when doing "where" queries (not find queries)
         #
         # It's used to apply the authorization feature.
@@ -205,6 +194,10 @@ module Avo
         end
         alias_method :singular_name, :name
 
+        def initials
+          name.to_s.split(" ").map(&:first).join("").first(2).upcase
+        end
+
         def plural_name
           name_from_translation_key(count: 2, default: name.pluralize)
         end
@@ -282,7 +275,7 @@ module Avo
       def initialize(record: nil, view: nil, user: nil, params: nil)
         @view = Avo::ViewInquirer.new(view) if view.present?
         @user = user if user.present?
-        @params = params if params.present?
+        @params = params.presence || {}
 
         if record.present?
           @record = record
@@ -451,6 +444,25 @@ module Avo
         end
       end
 
+      def record_icon
+        fetch_record_icon.to_s
+      end
+
+      def fetch_record_icon
+        return icon if @record.nil?
+
+        # Get the icon from the record if icon is not set
+        return @record.try(:icon) if icon.nil?
+
+        # If the icon is a symbol, get the value from the record else execute the block/string
+        case icon
+        when Symbol
+          @record.send icon
+        when Proc
+          Avo::ExecutionContext.new(target: icon, resource: self, record: @record).handle
+        end
+      end
+
       def available_view_types
         @available_view_types ||= begin
           if self.class.view_types.present?
@@ -654,7 +666,7 @@ module Avo
       end
 
       def get_external_link
-        return unless record.persisted?
+        return unless record&.persisted?
 
         Avo::ExecutionContext.new(target: external_link, resource: self, record: record).handle
       end
@@ -675,15 +687,15 @@ module Avo
 
       def view_type
         @view_type ||= if @params[:view_type].present?
-          @params[:view_type]
+          Avo::ViewInquirer.new(@params[:view_type])
         elsif available_view_types.size == 1
-          available_view_types.first
+          Avo::ViewInquirer.new(available_view_types.first)
         else
-          Avo::ExecutionContext.new(
+          Avo::ViewInquirer.new(Avo::ExecutionContext.new(
             target: default_view_type || Avo.configuration.default_view_type,
             resource: self,
             view: @view
-          ).handle
+          ).handle)
         end
       end
 

data/lib/avo/resources/controls/actions_list.rb

@@ -2,14 +2,14 @@ module Avo
   module Resources
     module Controls
       class ActionsList < BaseControl
-        ACTIONS_LIST_DROPDOWN_ICON = "heroicons/outline/arrow-down-circle" unless defined?(ACTIONS_LIST_DROPDOWN_ICON)
+        ACTIONS_LIST_DROPDOWN_ICON = "tabler/outline/circle-arrow-down" unless defined?(ACTIONS_LIST_DROPDOWN_ICON)
 
         attr_reader :color, :exclude, :include, :style, :icon
 
         def initialize(**args)
-          super(**args)
+          super
 
-          @color = args[:color] || :primary
+          @color = args[:color]
           @exclude = args[:exclude] || []
           @include = args[:include] || []
           @style = args[:style] || :outline

data/lib/avo/resources/controls/base_control.rb

@@ -10,7 +10,7 @@ module Avo
           @color = args[:color] || :gray
           @style = args[:style] || :text
           @icon = args[:icon]
-          @icon_class = @style == :icon ? " text-gray-600 h-6 hover:text-gray-600" : ""
+          @icon_class = (@style == :icon) ? " text-gray-600 h-6 hover:text-gray-600" : ""
           @confirmation_message = args[:confirmation_message]
           @size = args[:size] || :md
           @as_index_control = args[:as_index_control]

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

@@ -0,0 +1,16 @@
+class Avo::Resources::Items::Card < Avo::Resources::Items::ItemGroup
+  class Builder < Avo::Resources::Items::ItemGroup::Builder
+    include Avo::Concerns::HasFieldDiscovery
+
+    def initialize(parent:, title: nil, **args)
+      @card = Avo::Resources::Items::Card.new(title: title, **args)
+      @items_holder = Avo::Resources::Items::Holder.new(from: self.class, parent: parent)
+    end
+
+    # Fetch the card
+    def build
+      @card.items_holder = @items_holder
+      @card
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+class Avo::Resources::Items::Header
+  prepend Avo::Concerns::IsResourceItem
+
+  include Avo::Concerns::HasItemType
+
+  def initialize(**args)
+    @args = args
+  end
+
+  def visible? = true
+end

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

@@ -29,7 +29,7 @@ class Avo::Resources::Items::Holder
       as = args.fetch(:as, nil)
 
       alert_type = :error
-      message = "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded bg-red-600'>field :#{field_name}, as: :#{as}</code>"
+      message = "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded-sm bg-red-600'>field :#{field_name}, as: :#{as}</code>"
 
       if as == :markdown
         alert_type = :warning
@@ -49,14 +49,13 @@ class Avo::Resources::Items::Holder
     add_item field_parser.instance
   end
 
-  def tabs(tab = nil, id: nil, name: nil, title: nil, description: nil, **args, &block)
+  def tabs(tab = nil, id: nil, title: nil, description: nil, **args, &block)
     if tab.present?
       add_item tab
     else
       add_item Avo::Resources::Items::TabGroup::Builder.parse_block(
         parent: @parent,
         id: id,
-        name: name,
         title: title,
         description: description,
         **args,
@@ -65,28 +64,24 @@ class Avo::Resources::Items::Holder
     end
   end
 
-  def tab(name, **args, &block)
-    add_item Avo::Resources::Items::Tab::Builder.parse_block(name: name, parent: @parent, **args, &block)
+  def tab(title:, **args, &block)
+    add_item Avo::Resources::Items::Tab::Builder.parse_block(title: title, parent: @parent, **args, &block)
   end
 
-  def cluster(**args, &block)
-    add_item Avo::Resources::Items::Row::Builder.parse_block(parent: @parent, **args, &block)
+  def tool(klass, **args)
+    add_item klass.new(**args, view: parent.view, parent: parent)
   end
 
-  # def row
-  alias_method :row, :cluster
-
-  def tool(klass, **args)
-    add_item klass.new(**args, view: self.parent.view, parent: self.parent)
+  def panel(title: nil, **args, &block)
+    add_item Avo::Resources::Items::ItemGroup::Builder.parse_block(title: title, parent: @parent, **args, &block)
   end
 
-  def panel(panel_name = nil, **args, &block)
-    add_item Avo::Resources::Items::ItemGroup::Builder.parse_block(name: panel_name, parent: @parent, **args, &block)
+  def card(title: nil, **args, &block)
+    add_item Avo::Resources::Items::Card::Builder.parse_block(title: title, parent: @parent, **args, &block)
   end
 
-  # The main panel is the one that also render the header of the resource with the breadcrumbs, the title and the controls.
-  def main_panel(**args, &block)
-    add_item Avo::Resources::Items::MainPanel::Builder.parse_block(name: "main_panel", parent: @parent, **args, &block)
+  def header(**args, &block)
+    add_item Avo::Resources::Items::Header.new(**args)
   end
 
   def sidebar(**args, &block)
@@ -95,6 +90,12 @@ class Avo::Resources::Items::Holder
     add_item Avo::Resources::Items::Sidebar::Builder.parse_block(parent: @parent, **args, &block)
   end
 
+  def check_sidebar_is_inside_a_panel
+    unless @from.eql?(Avo::Resources::Items::Panel::Builder) || @from.eql?(Avo::Resources::Items::MainPanel::Builder)
+      raise "The sidebar must be inside a panel."
+    end
+  end
+
   def add_item(instance)
     @items << instance
 
@@ -110,10 +111,4 @@ class Avo::Resources::Items::Holder
   def increment_order_index
     @items_index += 1
   end
-
-  def check_sidebar_is_inside_a_panel
-    unless @from.eql?(Avo::Resources::Items::Panel::Builder) || @from.eql?(Avo::Resources::Items::MainPanel::Builder)
-      raise "The sidebar must be inside a panel."
-    end
-  end
 end

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

@@ -7,13 +7,13 @@ class Avo::Resources::Items::ItemGroup
   include Avo::Concerns::VisibleInDifferentViews
   include Avo::Concerns::IsVisible
 
-  attr_reader :name
+  attr_reader :title
   attr_reader :description
 
   delegate :items, :add_item, to: :items_holder
 
-  def initialize(name: nil, description: nil, view: nil, **args)
-    @name = name
+  def initialize(title: nil, description: nil, view: nil, **args)
+    @title = title
     @view = Avo::ViewInquirer.new view
     @description = description
     @items_holder = Avo::Resources::Items::Holder.new
@@ -28,13 +28,11 @@ class Avo::Resources::Items::ItemGroup
 
     delegate :heading, to: :items_holder
     delegate :field, to: :items_holder
-    delegate :row, to: :items_holder
-    delegate :cluster, to: :items_holder
     delegate :items, to: :items_holder
     delegate :sidebar, to: :items_holder
 
-    def initialize(parent:, name: nil, **args)
-      @panel = Avo::Resources::Items::Panel.new(name: name, **args)
+    def initialize(parent:, title: nil, **args)
+      @panel = Avo::Resources::Items::Panel.new(title: title, **args)
       @items_holder = Avo::Resources::Items::Holder.new(from: self.class, parent: parent)
     end
 

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

@@ -9,22 +9,17 @@ class Avo::Resources::Items::Sidebar
 
   delegate :items, :add_item, to: :items_holder
 
-  attr_reader :name
+  attr_reader :title
 
-  def initialize(name: nil, view: nil, **args)
-    @name = name
+  def initialize(title: nil, view: nil, **args)
+    @title = title
     @items_holder = Avo::Resources::Items::Holder.new
     @view = Avo::ViewInquirer.new view
-    @panel_wrapper = args[:panel_wrapper].nil? ? true : args[:panel_wrapper]
     @args = args
 
     post_initialize if respond_to?(:post_initialize)
   end
 
-  def panel_wrapper?
-    @panel_wrapper
-  end
-
   class Builder
     include Avo::Concerns::BorrowItemsHolder
     include Avo::Concerns::HasFieldDiscovery
@@ -33,8 +28,9 @@ class Avo::Resources::Items::Sidebar
     delegate :tool, to: :items_holder
     delegate :items, to: :items_holder
     delegate :heading, to: :items_holder
+    delegate :card, to: :items_holder
 
-    def initialize(parent: , name: nil, **args)
+    def initialize(parent:, **args)
       @sidebar = Avo::Resources::Items::Sidebar.new(**args)
       @items_holder = Avo::Resources::Items::Holder.new(parent: parent)
     end

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

@@ -12,8 +12,8 @@ class Avo::Resources::Items::Tab
   attr_accessor :description
   attr_reader :lazy_load
 
-  def initialize(name: nil, description: nil, view: nil, **args)
-    @name = name
+  def initialize(title: nil, description: nil, view: nil, **args)
+    @title = title
     @description = description
     @items_holder = Avo::Resources::Items::Holder.new
     @view = Avo::ViewInquirer.new view
@@ -24,17 +24,17 @@ class Avo::Resources::Items::Tab
     post_initialize if respond_to?(:post_initialize)
   end
 
-  def name
-    Avo::ExecutionContext.new(target: @name).handle
+  def title
+    Avo::ExecutionContext.new(target: @title).handle
   end
 
   def id
-    name.to_s.parameterize
+    title.to_s.parameterize
   end
   alias_method :to_param, :id
 
   def turbo_frame_id(parent: nil)
-    digest_name = Digest::MD5.hexdigest(name)
+    digest_name = Digest::MD5.hexdigest(title)
     id = "#{Avo::Resources::Items::Tab.to_s.parameterize} #{digest_name}".parameterize
     return id if parent.nil?
 
@@ -49,8 +49,8 @@ class Avo::Resources::Items::Tab
     delegate :panel, to: :items_holder
     delegate :items, to: :items_holder
 
-    def initialize(parent:, name: nil, **args)
-      @tab = Avo::Resources::Items::Tab.new(name: name, **args)
+    def initialize(parent:, title: nil, **args)
+      @tab = Avo::Resources::Items::Tab.new(title: title, **args)
       @items_holder = Avo::Resources::Items::Holder.new(parent: parent)
     end
 

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

@@ -6,9 +6,9 @@ class Avo::Resources::Items::TabGroup
   include Avo::Concerns::IsVisible
   include Avo::Concerns::VisibleInDifferentViews
 
-  attr_accessor :index, :style, :name, :title, :description
+  attr_accessor :index, :style, :title, :description
 
-  def initialize(index: 0, view: nil, style: nil, title: nil, description: nil, id: nil, name: nil, **args)
+  def initialize(index: 0, view: nil, style: nil, title: nil, description: nil, id: nil, **args)
     @index = index
     @items_holder = Avo::Resources::Items::Holder.new
     @view = Avo::ViewInquirer.new view
@@ -16,7 +16,6 @@ class Avo::Resources::Items::TabGroup
     @title = title
     @description = description
     @id = id
-    @name = name
     @args = args
     @visible = args[:visible]
 
@@ -24,11 +23,11 @@ class Avo::Resources::Items::TabGroup
   end
 
   # The user might assign an id to a group.
-  # If not, we'll use the name.
+  # If not, we'll use the title.
   # If not, we'll use the index
   def id
     return @id if @id.present?
-    return @name.parameterize if @name.present?
+    return @title.parameterize if @title.present?
 
     index
   end
@@ -51,14 +50,14 @@ class Avo::Resources::Items::TabGroup
       parsed = Avo::Dsl::FieldParser.new(id: field_name, order_index: @items_index, **args, &block).parse
       field_instance = parsed.instance
 
-      name = field_instance.name
-      tab = Avo::Resources::Items::Tab.new name: name
+      title = field_instance.name
+      tab = Avo::Resources::Items::Tab.new title: title
 
       if field_instance.has_own_panel?
         tab.items_holder.add_item parsed.instance
       else
         # If the field is not in a panel, create one and add it
-        panel = Avo::Resources::Items::Panel.new name: name
+        panel = Avo::Resources::Items::Panel.new title: title
         panel.items_holder.add_item parsed.instance
         # Add that panel to the items_holder
         tab.items_holder.add_item panel
@@ -67,9 +66,8 @@ class Avo::Resources::Items::TabGroup
       @items_holder.tabs tab
     end
 
-    def initialize(name:, id:, parent:, title: nil, description: nil, style: nil, **args)
+    def initialize(id:, parent:, title: nil, description: nil, style: nil, **args)
       @group = Avo::Resources::Items::TabGroup.new(
-        name: name,
         id: id,
         style: style,
         title: title,

data/lib/avo/resources/resource_manager.rb

@@ -164,7 +164,8 @@ module Avo
               resource.model_class,
               Avo.configuration.authorization_methods.stringify_keys["index"],
               policy_class: resource.authorization_policy,
-              raise_exception: false
+              raise_exception: false,
+              resource_class: resource.to_s
             )
           end
           .sort_by { |r| r.name }