avo 2.46.0 → 3.0.0.pre2

data/lib/avo/fields/belongs_to_field.rb

@@ -57,6 +57,7 @@ module Avo
     # - is_disabled?
 
     class BelongsToField < BaseField
+      include Avo::Fields::Concerns::IsSearchable
       include Avo::Fields::Concerns::UseResource
 
       attr_accessor :target
@@ -84,10 +85,6 @@ module Avo
         @use_resource = args[:use_resource] || nil
       end
 
-      def searchable
-        @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
-      end
-
       def value
         if is_polymorphic?
           # Get the value from the pre-filled assoociation record
@@ -118,12 +115,12 @@ module Avo
 
       def values_for_type(model = nil)
         resource = target_resource
-        resource = App.get_resource_by_model_name model if model.present?
+        resource = Avo::App.resources.get_resource_by_model_class model if model.present?
 
         query = resource.class.query_scope
 
         if attach_scope.present?
-          query = Avo::Hosts::AssociationScopeHost.new(block: attach_scope, query: query, parent: get_model).handle
+          query = Avo::ExecutionContext.new(target: attach_scope, query: query, parent: get_model).handle
         end
 
         query.all.map do |model|
@@ -160,8 +157,8 @@ module Avo
       def foreign_key
         return polymorphic_as if polymorphic_as.present?
 
-        if @model.present?
-          get_model_class(@model).reflections[@relation_method].foreign_key
+        if @record.present?
+          get_model_class(@record).reflections[@relation_method].foreign_key
         elsif @resource.present? && @resource.model_class.reflections[@relation_method].present?
           @resource.model_class.reflections[@relation_method].foreign_key
         end
@@ -200,12 +197,10 @@ module Avo
         return model unless model.methods.include? key.to_sym
 
         if polymorphic_as.present?
-          valid_model_class = valid_polymorphic_class params["#{polymorphic_as}_type"]
-
-          model.send("#{polymorphic_as}_type=", valid_model_class)
+          model.send("#{polymorphic_as}_type=", params["#{polymorphic_as}_type"])
 
           # If the type is blank, reset the id too.
-          if valid_model_class.blank?
+          if params["#{polymorphic_as}_type"].blank?
             model.send("#{polymorphic_as}_id=", nil)
           else
             model.send("#{polymorphic_as}_id=", params["#{polymorphic_as}_id"])
@@ -217,12 +212,6 @@ module Avo
         model
       end
 
-      def valid_polymorphic_class(possible_class)
-        types.find do |type|
-          type.to_s == possible_class.to_s
-        end
-      end
-
       def database_id
         # If the field is a polymorphic value, return the polymorphic_type as key and pre-fill the _id in fill_field.
         return "#{polymorphic_as}_type" if polymorphic_as.present?
@@ -237,7 +226,7 @@ module Avo
 
         if is_polymorphic?
           if value.present?
-            return App.get_resource_by_model_name(value.class)
+            return Avo::App.resources.get_resource_by_model_class(value.class)
           else
             return nil
           end
@@ -245,19 +234,19 @@ module Avo
 
         reflection_key = polymorphic_as || id
 
-        if @model._reflections[reflection_key.to_s].klass.present?
-          App.get_resource_by_model_name @model._reflections[reflection_key.to_s].klass.to_s
-        elsif @model._reflections[reflection_key.to_s].options[:class_name].present?
-          App.get_resource_by_model_name @model._reflections[reflection_key.to_s].options[:class_name]
+        if @record._reflections[reflection_key.to_s].klass.present?
+          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
+        elsif @record._reflections[reflection_key.to_s].options[:class_name].present?
+          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
         else
           App.get_resource_by_name reflection_key.to_s
         end
       end
 
       def get_model
-        return @model if @model.present?
+        return @record if @record.present?
 
-        @resource.model
+        @resource.record
       rescue
         nil
       end

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

@@ -0,0 +1,49 @@
+module Avo
+  module Fields
+    module Concerns
+      module HandlesFieldArgs
+        extend ActiveSupport::Concern
+
+        private
+
+        # Add an instance variable from args
+        # That may be a string, boolean, or array
+        # Each args should also have a default value
+        def add_prop_from_args(args = {}, name: nil, type: :string, default: nil)
+          value = default
+
+          if type == :boolean
+            case args[name.to_sym]
+            when nil
+              value = default
+            when false
+              value = false
+            when true
+              value = true
+            end
+          else
+            value = args[name.to_sym] unless args.dig(name.to_sym).nil?
+          end
+
+          instance_variable_set(:"@#{name}", value)
+        end
+
+        def add_boolean_prop(args, name, default = false)
+          add_prop_from_args args, name: name, default: default, type: :boolean
+        end
+
+        def add_array_prop(args, name, default = [])
+          add_prop_from_args args, name: name, default: default, type: :array
+        end
+
+        def add_object_prop(args, name, default = {})
+          add_prop_from_args args, name: name, default: default, type: :object
+        end
+
+        def add_string_prop(args, name, default = nil)
+          add_prop_from_args args, name: name, default: default, type: :string
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,22 @@
+module Avo
+  module Fields
+    module Concerns
+      module HasFieldName
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def field_name(name)
+            self.field_name_attribute = name
+          end
+
+          # Get the field name
+          def get_field_name
+            return field_name_attribute if field_name_attribute.present?
+
+            to_s.demodulize.underscore.gsub "_field", ""
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,110 @@
+module Avo
+  module Fields
+    module Concerns
+      module HasHTMLAttributes
+        extend ActiveSupport::Concern
+
+        attr_reader :html
+
+        # Used to get attributes for elements and views
+        #
+        # examples:
+        # get_html :data, view: :edit, element: :input
+        # get_html :classes, view: :show, element: :wrapper
+        # get_html :styles, view: :index, element: :wrapper
+        def get_html(name = nil, element:, view:)
+          if [view, element].any?(&:nil?)
+            default_attribute_value name
+          end
+
+          parsed = parse_html
+
+          attributes = if parsed.is_a? Hash
+            get_html_from_hash name, element: element, hash: parsed, view: view
+          elsif parsed.is_a? Avo::HTML::Builder
+            get_html_from_block name, element: element, html_builder: parsed, view: view
+          elsif parsed.nil?
+            # Handle empty parsed by returning an empty state
+            default_attribute_value name
+          end
+
+          add_default_data_attributes attributes, name, element, view
+        end
+
+        private
+
+        # Returns Hash, HTML::Builder, or nil.
+        def parse_html
+          return if @html.nil?
+
+          if @html.is_a? Hash
+            @html
+          elsif @html.respond_to? :call
+            Avo::HTML::Builder.parse_block(record: record, resource: resource, &@html)
+          end
+        end
+
+        def default_attribute_value(name)
+          name == :data ? {} : ""
+        end
+
+        def add_default_data_attributes(attributes, name, element, view)
+          if !attributes.nil? && name == :data && element == :input && view.in?([:edit, :new]) && resource.present? && resource.respond_to?(:get_stimulus_controllers)
+            extra_attributes = resource.get_stimulus_controllers
+              .split(" ")
+              .map do |controller|
+                [:"#{controller}-target", "#{id.to_s.underscore}_#{type.to_s.underscore}_input".camelize(:lower)]
+              end
+              .to_h
+
+            attributes.merge extra_attributes
+          else
+            attributes
+          end
+        end
+
+        def get_html_from_block(name = nil, element:, html_builder:, view:)
+          values = []
+
+          # get view ancestor
+          values << html_builder.dig_stack(view, element, name)
+          # get element ancestor
+          values << html_builder.dig_stack(element, name)
+          # get direct ancestor
+          values << html_builder.dig_stack(name)
+
+          values_type = if name == :data
+            :hash
+          else
+            :string
+          end
+
+          merge_values_as(as: values_type, values: values)
+        end
+
+        def get_html_from_hash(name = nil, element:, hash:, view:)
+          # @todo: what if this is not a Hash but a string?
+          hash.dig(view, element, name) || {}
+        end
+
+        # Merge the values from all possible locations.
+        # If the result is "blank", return nil so the attributes are not outputted to the DOM.
+        #
+        # Ex: if the style attribute is empty return `nil` instead of an empty space `" "`
+        def merge_values_as(as: :array, values: [])
+          result = if as == :array
+            values.flatten
+          elsif as == :string
+            values.select do |value|
+              value.is_a? String
+            end.join " "
+          elsif as == :hash
+            values.reduce({}, :merge)
+          end
+
+          result if result.present?
+        end
+      end
+    end
+  end
+end

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

@@ -7,11 +7,7 @@ module Avo
         attr_reader :disabled
 
         def is_disabled?
-          if disabled.respond_to? :call
-            Avo::Hosts::ResourceViewRecordHost.new(block: disabled, record: model, view: view, resource: resource).handle
-          else
-            disabled
-          end
+          Avo::ExecutionContext.new(target: disabled, record: record, view: view, resource: resource).handle
         end
       end
     end

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,13 @@
+module Avo
+  module Fields
+    module Concerns
+      module IsSearchable
+        extend ActiveSupport::Concern
+
+        def is_searchable?
+          defined?(AvoPro) && @searchable && ::Avo::App.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::App.resources.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/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_field.rb

@@ -20,26 +20,13 @@ module Avo
       def formatted_value
         return if value.blank?
 
-        try_iso8601
+        value.iso8601
       end
 
       def edit_formatted_value
-        formatted_value
-      end
-
-      private
+        return nil if value.nil?
 
-      def try_iso8601
-        if value.respond_to?(:iso8601)
-          value.iso8601
-        elsif value.is_a?(String)
-          parsed = DateTime.parse(value.dup)
-          if parsed.present?
-            parsed
-          end
-        else
-          value
-        end
+        value.iso8601
       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/field_manager.rb

@@ -0,0 +1,45 @@
+module Avo
+  module Fields
+    class FieldManager
+      class << self
+        def build
+          instance = new
+          instance.init_fields
+          instance
+        end
+      end
+
+      attr_reader :fields
+
+      alias_method :all, :fields
+
+      def initialize
+        @fields = []
+      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,
+          class: klass
+        )
+      end
+    end
+  end
+end

data/lib/avo/fields/file_field.rb

@@ -7,7 +7,6 @@ module Avo
       attr_accessor :is_audio
       attr_accessor :direct_upload
       attr_accessor :accept
-      attr_reader :display_filename
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -18,7 +17,6 @@ module Avo
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false
         @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]
       end
 
       def path

data/lib/avo/fields/files_field.rb

@@ -5,9 +5,6 @@ module Avo
       attr_accessor :is_image
       attr_accessor :direct_upload
       attr_accessor :accept
-      attr_reader :display_filename
-      attr_reader :view_type
-      attr_reader :hide_view_type_switcher
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -16,9 +13,6 @@ module Avo
         @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]
-        @view_type = args[:view_type] || :grid
-        @hide_view_type_switcher = args[:hide_view_type_switcher]
       end
 
       def view_component_name

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::App.resources.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(turbo_frame: turbo_frame)
           .to_s
       end
 
@@ -59,12 +56,12 @@ module Avo
       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::App.resources.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
+        elsif @record._reflections[id.to_s].options[:class_name].present?
+          Avo::App.resources.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
         else
-          Avo::App.get_resource_by_name id.to_s
+          Avo::App.resources.get_resource_by_name id.to_s
         end
       end
 
@@ -90,7 +87,7 @@ module Avo
 
       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)

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)
 
@@ -17,12 +17,8 @@ module Avo
         value.send(target_resource.title)
       end
 
-      def resource
-        Avo::App.get_resource_by_model_name @model.class
-      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)
           .to_s
@@ -30,14 +26,13 @@ module Avo
 
       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_record = related_class.safe_constantize.find value
         end
 
-        model.public_send("#{key}=", related_model)
+        model.public_send("#{key}=", related_record)
 
         model
       end

data/lib/avo/fields/heading_field.rb

@@ -1,4 +1,4 @@
-require 'securerandom'
+require "securerandom"
 
 module Avo
   module Fields
@@ -16,6 +16,9 @@ module Avo
 
         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