avo 2.46.0 → 3.0.2

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

@@ -5,11 +5,7 @@ module Avo
         extend ActiveSupport::Concern
 
         def is_readonly?
-          if readonly.respond_to? :call
-            Avo::Hosts::ResourceViewRecordHost.new(block: readonly, record: model, view: view, resource: resource).handle
-          else
-            readonly
-          end
+          Avo::ExecutionContext.new(target: readonly, record: record, view: view, resource: resource).handle
         end
       end
     end

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

@@ -5,17 +5,15 @@ module Avo
         extend ActiveSupport::Concern
 
         def is_required?
-          if required.respond_to? :call
-            Avo::Hosts::ResourceViewRecordHost.new(block: required, record: model, view: view, resource: resource).handle
-          else
-            required.nil? ? required_from_validators : required
-          end
+          return required_from_validators if required.nil?
+
+          Avo::ExecutionContext.new(target: required, record: record, view: view, resource: resource).handle
         end
 
         private
 
         def required_from_validators
-          return false if model.nil?
+          return false if record.nil?
 
           validators.any? do |validator|
             validator.is_a? ActiveModel::Validations::PresenceValidator
@@ -23,7 +21,7 @@ module Avo
         end
 
         def validators
-          model.class.validators_on(id)
+          record.class.validators_on(id)
         end
       end
     end

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

@@ -0,0 +1,15 @@
+module Avo
+  module Fields
+    module Concerns
+      module IsSearchable
+        extend ActiveSupport::Concern
+
+        def is_searchable?
+          return false unless defined?(Avo::Pro)
+
+          @searchable && Avo.license.has_with_trial(:searchable_associations)
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,11 @@ module Avo
         extend ActiveSupport::Concern
 
         def use_resource
-          App.get_resource @use_resource
+          Avo.resource_manager.get_resource @use_resource
+        rescue
+          # On boot we eager load the resources before the app is set.
+          # Because of that, we don't have a resource manager.
+          nil
         end
       end
     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/country_field.rb

@@ -30,6 +30,10 @@ module Avo
           end
         end
       end
+
+      def options_for_filter
+        select_options
+      end
     end
   end
 end

data/lib/avo/fields/date_time_field.rb

@@ -51,11 +51,7 @@ module Avo
       end
 
       def timezone
-        if @timezone.respond_to?(:call)
-          return Avo::Hosts::ResourceViewRecordHost.new(block: @timezone, record: resource.model, resource: resource, view: view).handle
-        end
-
-        @timezone
+        Avo::ExecutionContext.new(target: @timezone, record: resource.record, resource: resource, view: view).handle
       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/field_manager.rb

@@ -0,0 +1,55 @@
+module Avo
+  module Fields
+    class FieldManager
+      class << self
+        def build
+          instance = new
+          instance.init_fields
+          instance
+        end
+      end
+
+      attr_reader :fields
+
+      def initialize
+        @fields = []
+      end
+
+      def all
+        fields
+          .map do |field|
+            field[:name] = field[:name].to_s
+
+            field
+          end
+          .uniq do |field|
+            field[:name]
+          end
+      end
+
+      # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
+      # so later we can instantiate them on our resources.
+      #
+      # If the field has their `def_method` set up it will follow that convention, if not it will snake_case the name:
+      #
+      # Avo::Fields::TextField -> text
+      # Avo::Fields::DateTimeField -> date_time
+      def init_fields
+        Avo::Fields::BaseField.descendants.each do |class_name|
+          next if class_name.to_s == "BaseField"
+
+          if class_name.to_s.end_with? "Field"
+            load_field class_name.get_field_name, class_name
+          end
+        end
+      end
+
+      def load_field(method_name, klass)
+        fields.push(
+          name: method_name.to_s,
+          class: klass
+        )
+      end
+    end
+  end
+end

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_and_belongs_to_many_field.rb

@@ -4,8 +4,7 @@ module Avo
       def initialize(id, **args, &block)
         args[:updatable] = false
 
-        hide_on :all
-        show_on Avo.configuration.resource_default_view
+        only_on Avo.configuration.resource_default_view
 
         super(id, **args, &block)
       end

data/lib/avo/fields/has_base_field.rb

@@ -1,6 +1,7 @@
 module Avo
   module Fields
     class HasBaseField < BaseField
+      include Avo::Fields::Concerns::IsSearchable
       include Avo::Fields::Concerns::UseResource
 
       attr_accessor :display
@@ -25,12 +26,8 @@ module Avo
         @link_to_child_resource = args[:link_to_child_resource] || false
       end
 
-      def searchable
-        @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
-      end
-
-      def resource
-        @resource || Avo::App.get_resource_by_model_name(@model.class)
+      def field_resource
+        resource || Avo.resource_manager.get_resource_by_model_class(@record.class)
       end
 
       def turbo_frame
@@ -38,9 +35,9 @@ module Avo
       end
 
       def frame_url
-        Avo::Services::URIService.parse(@resource.record_path)
+        Avo::Services::URIService.parse(field_resource.record_path)
           .append_path(id.to_s)
-          .append_query(turbo_frame: turbo_frame.to_s)
+          .append_query(query_params)
           .to_s
       end
 
@@ -53,18 +50,18 @@ module Avo
 
       # What the user sees in the text field
       def field_label
-        value.send(target_resource.class.title)
+        target_resource.new(record: value, view: view, user: user).record_title
       rescue
         nil
       end
 
       def target_resource
-        if @model._reflections[id.to_s].klass.present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
-        elsif @model._reflections[id.to_s].options[:class_name].present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
+        if @record._reflections[id.to_s].klass.present?
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
+        elsif @record._reflections[id.to_s].options[:class_name].present?
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
         else
-          Avo::App.get_resource_by_name id.to_s
+          Avo.resource_manager.get_resource_by_name id.to_s
         end
       end
 
@@ -82,15 +79,15 @@ 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
 
       def authorized?
         method = "view_#{id}?".to_sym
-        service = resource.authorization
+        service = field_resource.authorization
 
         if service.has_method? method
           service.authorize_action(method, raise_exception: false)
@@ -103,6 +100,13 @@ module Avo
         use_resource&.name || super
       end
 
+      def query_params
+        {
+          turbo_frame: turbo_frame,
+          view: view
+        }
+      end
+
       private
 
       def frame_id

data/lib/avo/fields/has_many_field.rb

@@ -4,11 +4,14 @@ module Avo
       def initialize(id, **args, &block)
         args[:updatable] = false
 
-        hide_on :all
-        show_on Avo.configuration.resource_default_view
+        only_on Avo.configuration.resource_default_view
 
         super(id, **args, &block)
       end
+
+      def translated_name(default:)
+        t(translation_key, count: 2, default: default_name).capitalize
+      end
     end
   end
 end

data/lib/avo/fields/has_one_field.rb

@@ -4,7 +4,7 @@ module Avo
       attr_accessor :relation_method
 
       def initialize(id, **args, &block)
-        hide_on :new, :edit
+        hide_on :forms
 
         super(id, **args, &block)
 
@@ -14,30 +14,26 @@ module Avo
       end
 
       def label
-        value.send(target_resource.title)
-      end
-
-      def resource
-        Avo::App.get_resource_by_model_name @model.class
+        field_label
       end
 
       def frame_url
-        Avo::Services::URIService.parse(@resource.record_path)
+        Avo::Services::URIService.parse(field_resource.record_path)
           .append_paths(id, value.id)
-          .append_query(turbo_frame: turbo_frame)
+          .append_query(query_params)
           .to_s
       end
 
       def fill_field(model, key, value, params)
         if value.blank?
-          related_model = nil
+          related_record = nil
         else
           related_class = model.class.reflections[name.to_s.downcase].class_name
-          related_resource = ::Avo::App.get_resource_by_model_name(related_class)
-          related_model = related_resource.find_record value
+          related_resource = Avo.resource_manager.get_resource_by_model_class(related_class)
+          related_record = related_resource.find_record value
         end
 
-        model.public_send("#{key}=", related_model)
+        model.public_send("#{key}=", related_record)
 
         model
       end

data/lib/avo/fields/heading_field.rb

@@ -1,35 +1,30 @@
-require 'securerandom'
+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
 
+      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].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/hidden_field.rb

@@ -4,7 +4,7 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        only_on [:edit, :new]
+        only_on :forms
       end
     end
   end

data/lib/avo/fields/id_field.rb

@@ -1,18 +1,18 @@
 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
 
-        hide_on [:edit, :new]
+        hide_on :forms
 
         super(id, **args, &block)
 
         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/location_field.rb

@@ -19,9 +19,9 @@ module Avo
 
       def as_lat_long_field_id(get)
         if get == :lat
-          "#{id}[#{stored_as.first}]"
+          stored_as.first
         elsif get == :long
-          "#{id}[#{stored_as.last}]"
+          stored_as.last
         end
       end
 
@@ -35,20 +35,20 @@ module Avo
 
       def as_lat_long_value(get)
         if get == :lat
-          model.send(stored_as.first)
+          record.send(stored_as.first)
         elsif get == :long
-          model.send(stored_as.last)
+          record.send(stored_as.last)
         end
       end
 
-      def fill_field(model, key, value, params)
+      def fill_field(record, key, value, params)
         if value_as_array?
           latitude_field, longitude_field = stored_as
-          model.send("#{latitude_field}=", value[latitude_field])
-          model.send("#{longitude_field}=", value[longitude_field])
-          model
+          record.send("#{latitude_field}=", value[latitude_field])
+          record.send("#{longitude_field}=", value[longitude_field])
+          record
         else
-          super(model, key, value.split(","), params)
+          super(record, key, value.split(","), params)
         end
       end
 
@@ -62,7 +62,7 @@ module Avo
 
       def value
         if value_as_array?
-          [@model.send(stored_as.first), @model.send(stored_as.last)]
+          [@record.send(stored_as.first), @record.send(stored_as.last)]
         else
           super
         end

data/lib/avo/fields/password_field.rb

@@ -6,7 +6,7 @@ module Avo
 
         super(id, **args, &block)
 
-        hide_on [:index, :show]
+        hide_on :index, :show
       end
     end
   end

data/lib/avo/fields/preview_field.rb

@@ -0,0 +1,14 @@
+module Avo
+  module Fields
+    class PreviewField < BaseField
+      def table_header_label
+        # If the user gives us a name, use that, if not, leave it blank
+        if @args[:name].present?
+          @args[:name]
+        else
+          ""
+        end
+      end
+    end
+  end
+end

data/lib/avo/fields/select_field.rb

@@ -14,11 +14,14 @@ module Avo
 
         @options_from_args = if args[:options].is_a? Hash
           ActiveSupport::HashWithIndifferentAccess.new args[:options]
+        elsif args[:enum].present?
+          args[:enum]
         else
           args[:options]
         end
-        @enum = args[:enum].present? ? args[:enum] : nil
-        @display_value = args[:display_value].present? ? args[:display_value] : false
+
+        @enum = args[:enum]
+        @display_value = args[:display_value] || false
       end
 
       def options_for_select
@@ -56,13 +59,14 @@ module Avo
 
       private
 
-      # Cache options as options given on block or as options received from arguments
       def options
-        if options_from_args.respond_to? :call
-          options_from_args.call model: model, resource: resource, view: view, field: self
-        else
-          options_from_args
-        end
+        Avo::ExecutionContext.new(
+          target: options_from_args,
+          record: record,
+          resource: resource,
+          view: view,
+          field: self
+        ).handle
       end
     end
   end

data/lib/avo/fields/status_field.rb

@@ -6,17 +6,23 @@ 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
       end
+
+      def options_for_filter
+        [@failed_when, @loading_when].flatten
+      end
     end
   end
 end

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