avo 3.0.0.beta1 → 3.0.0.pre1

data/lib/avo/fields/base_field.rb

@@ -33,14 +33,17 @@ module Avo
       attr_reader :nullable
       attr_reader :null_values
       attr_reader :format_using
-      attr_reader :autocomplete
       attr_reader :help
       attr_reader :default
+      attr_reader :as_label
       attr_reader :as_avatar
+      attr_reader :as_description
+      attr_reader :index_text_align
       attr_reader :stacked
       attr_reader :for_presentation_only
 
       # Private options
+      attr_reader :updatable
       attr_reader :computable # if allowed to be computable
       attr_reader :computed # if block is present
       attr_reader :computed_value # the value after computation
@@ -65,13 +68,14 @@ module Avo
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]
         @format_using = args[:format_using] || nil
-        @update_using = args[:update_using] || nil
         @placeholder = args[:placeholder]
-        @autocomplete = args[:autocomplete] || nil
         @help = args[:help] || nil
         @default = args[:default] || nil
-        @visible = args[:visible]
+        @visible = args[:visible] || true
+        @as_label = args[:as_label] || false
         @as_avatar = args[:as_avatar] || false
+        @as_description = args[:as_description] || false
+        @index_text_align = args[:index_text_align] || :left
         @html = args[:html] || nil
         @view = args[:view] || nil
         @value = args[:value] || nil
@@ -81,6 +85,7 @@ module Avo
 
         @args = args
 
+        @updatable = !readonly
         @computable = true
         @computed = block.present?
         @computed_value = nil
@@ -93,11 +98,11 @@ module Avo
       end
 
       def translated_name(default:)
-        t(translation_key, count: 1, default: default).humanize
+        t(translation_key, count: 1, default: default).capitalize
       end
 
       def translated_plural_name(default:)
-        t(translation_key, count: 2, default: default).humanize
+        t(translation_key, count: 2, default: default).capitalize
       end
 
       # Getting the name of the resource (user/users, post/posts)
@@ -155,48 +160,19 @@ module Avo
 
         # Run computable callback block if present
         if computable && block.present?
-          final_value = Avo::ExecutionContext.new(
-            target: block,
-            record: record,
-            resource: @resource,
-            view: @view,
-            field: self,
-            include: self.class.included_modules
-          ).handle
+          final_value = instance_exec(record, @resource, @view, self, &block)
         end
 
         # Run the value through resolver if present
-        if format_using.present?
-          final_value = Avo::ExecutionContext.new(
-            target: format_using,
-            value: final_value,
-            record: record,
-            resource: resource,
-            view: view,
-            field: self,
-            include: self.class.included_modules
-          ).handle
-        end
+        final_value = instance_exec(final_value, &@format_using) if @format_using.present?
 
         final_value
       end
 
-      # Fills the record with the received value on create and update actions.
       def fill_field(record, key, value, params)
         return record unless record.methods.include? key.to_sym
 
-        if @update_using.present?
-          value = Avo::ExecutionContext.new(
-            target: @update_using,
-            record: record,
-            key: key,
-            value: value,
-            resource: resource,
-            field: self
-          ).handle
-        end
-
-        record.public_send("#{key}=", value)
+        record.send("#{key}=", value)
 
         record
       end
@@ -273,19 +249,6 @@ module Avo
         options
       end
 
-      def updatable
-        !is_disabled? && visible?
-      end
-
-      # Used by Avo to fill the record with the default value on :new and :edit views
-      def assign_value(record:, value:)
-        id = type == "belongs_to" ? foreign_key : database_id
-
-        if record.send(id).nil?
-          record.send("#{id}=", value)
-        end
-      end
-
       private
 
       def model_or_class(model)

data/lib/avo/fields/belongs_to_field.rb

@@ -104,7 +104,9 @@ module Avo
 
       # What the user sees in the text field
       def field_label
-        label
+        value.send(target_resource.class.title)
+      rescue
+        nil
       end
 
       def options
@@ -113,16 +115,16 @@ module Avo
 
       def values_for_type(model = nil)
         resource = target_resource
-        resource = Avo.resource_manager.get_resource_by_model_class model if model.present?
+        resource = Avo::App.resources.get_resource_by_model_class model if model.present?
 
-        query = resource.query_scope
+        query = resource.class.query_scope
 
         if attach_scope.present?
           query = Avo::ExecutionContext.new(target: attach_scope, query: query, parent: get_model).handle
         end
 
-        query.all.map do |record|
-          [resource.new(record: record).record_title, record.id]
+        query.all.map do |model|
+          [model.send(resource.class.title), model.id]
         end
       end
 
@@ -180,8 +182,7 @@ module Avo
       end
 
       def label
-        return if target_resource.blank?
-        target_resource.new(record: value)&.record_title
+        value.send(target_resource.class.title)
       end
 
       def to_permitted_param
@@ -196,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"])
@@ -213,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?
@@ -233,7 +226,7 @@ module Avo
 
         if is_polymorphic?
           if value.present?
-            return Avo.resource_manager.get_resource_by_model_class(value.class)
+            return Avo::App.resources.get_resource_by_model_class(value.class)
           else
             return nil
           end
@@ -242,9 +235,9 @@ module Avo
         reflection_key = polymorphic_as || id
 
         if @record._reflections[reflection_key.to_s].klass.present?
-          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
+          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.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
+          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

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

@@ -5,7 +5,7 @@ module Avo
         extend ActiveSupport::Concern
 
         def is_searchable?
-          defined?(Avo::Pro) && @searchable && Avo.license.has_with_trial(:searchable_associations)
+          defined?(AvoPro) && @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Avo
         extend ActiveSupport::Concern
 
         def use_resource
-          Avo.resource_manager.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.

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/field_manager.rb

@@ -11,22 +11,12 @@ module Avo
 
       attr_reader :fields
 
+      alias_method :all, :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.
       #
@@ -46,7 +36,7 @@ module Avo
 
       def load_field(method_name, klass)
         fields.push(
-          name: method_name.to_s,
+          name: method_name,
           class: klass
         )
       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_base_field.rb

@@ -27,7 +27,7 @@ module Avo
       end
 
       def field_resource
-        resource || Avo.resource_manager.get_resource_by_model_class(@record.class)
+        resource || Avo::App.resources.get_resource_by_model_class(@record.class)
       end
 
       def turbo_frame
@@ -50,18 +50,18 @@ module Avo
 
       # What the user sees in the text field
       def field_label
-        target_resource.hydrate(record: value).record_title
+        value.send(target_resource.class.title)
       rescue
         nil
       end
 
       def target_resource
         if @record._reflections[id.to_s].klass.present?
-          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
+          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.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
+          Avo::App.resources.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
         else
-          Avo.resource_manager.get_resource_by_name id.to_s
+          Avo::App.resources.get_resource_by_name id.to_s
         end
       end
 

data/lib/avo/fields/has_one_field.rb

@@ -29,8 +29,7 @@ module Avo
           related_record = nil
         else
           related_class = model.class.reflections[name.to_s.downcase].class_name
-          related_resource = Avo.resource_manager.get_resource_by_model_class(related_class)
-          related_record = related_resource.find_record value
+          related_record = related_class.safe_constantize.find value
         end
 
         model.public_send("#{key}=", related_record)

data/lib/avo/fields/id_field.rb

@@ -5,13 +5,12 @@ module Avo
 
       def initialize(id, **args, &block)
         args[:readonly] = true
+        args[:sortable] = true
 
         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
       end
     end

data/lib/avo/filters/base_filter.rb

@@ -13,11 +13,6 @@ module Avo
       attr_reader :arguments
 
       delegate :params, to: Avo::Current
-      delegate :request, to: Avo::Current
-      delegate :view_context, to: Avo::Current
-      def curent_user
-        Avo::Current.user
-      end
 
       class << self
         def decode_filters(filter_params)
@@ -26,10 +21,6 @@ module Avo
           {}
         end
 
-        def encode_filters(filter_params)
-          Base64.encode64(filter_params.to_json)
-        end
-
         def get_empty_message
           empty_message || I18n.t("avo.no_options_available")
         end

data/lib/avo/grid_collector.rb

@@ -0,0 +1,40 @@
+module Avo
+  class GridCollector
+    attr_accessor :cover_field
+    attr_accessor :title_field
+    attr_accessor :body_field
+
+    def initialize
+      @cover_field = nil
+      @title_field = nil
+      @body_field = nil
+    end
+
+    def cover(field_name, as:, **args, &block)
+      field_parser = Avo::Dsl::FieldParser.new(id: field_name, as: as, **args, &block).parse
+      self.cover_field = field_parser.instance if field_parser.valid?
+    end
+
+    def title(field_name, as:, **args, &block)
+      field_parser = Avo::Dsl::FieldParser.new(id: field_name, as: as, **args, &block).parse
+      self.title_field = field_parser.instance if field_parser.valid?
+    end
+
+    def body(field_name, as:, **args, &block)
+      field_parser = Avo::Dsl::FieldParser.new(id: field_name, as: as, **args, &block).parse
+      self.body_field = field_parser.instance if field_parser.valid?
+    end
+
+    def hydrate(record:, view:, resource:)
+      cover_field.hydrate(record: record, view: view, resource: resource) if cover_field.present?
+      title_field.hydrate(record: record, view: view, resource: resource) if title_field.present?
+      body_field.hydrate(record: record, view: view, resource: resource) if body_field.present?
+
+      self
+    end
+
+    def blank?
+      title_field.blank?
+    end
+  end
+end

data/lib/avo/html/builder.rb

@@ -22,9 +22,7 @@ class Avo::HTML::Builder
   delegate :app, to: Avo::Current
   delegate :root_path, to: :app
   delegate :params, to: Avo::Current
-  def curent_user
-    Avo::Current.user
-  end
+  delegate :current_user, to: Avo::Current
 
   def initialize(record: nil, resource: nil)
     @wrapper_stack = {}

data/lib/avo/licensing/h_q.rb

@@ -4,7 +4,6 @@ module Avo
       attr_accessor :current_request
       attr_accessor :cache_store
 
-      # ENDPOINT = "https://v3.avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
       ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
       CACHE_TIME = 3600 unless const_defined?(:CACHE_TIME) # seconds
@@ -17,7 +16,7 @@ module Avo
 
       def initialize(current_request = nil)
         @current_request = current_request
-        @cache_store = Avo.cache_store
+        @cache_store = Avo::App.cache_store
       end
 
       def response
@@ -70,10 +69,10 @@ module Avo
           app_name: app_name
         }
 
-        # metadata = Avo::Services::DebugService.avo_metadata
-        # if metadata[:resources_count] != 0
-        #   result[:avo_metadata] = "metadata"
-        # end
+        metadata = Avo::Services::DebugService.avo_metadata
+        if metadata[:resources_count] != 0
+          result[:avo_metadata] = metadata
+        end
 
         result
       end
@@ -150,11 +149,7 @@ module Avo
       def perform_request
         Avo.logger.debug "Performing request to avohq.io API to check license availability." if Rails.env.development?
 
-        if Rails.env.test?
-          OpenStruct.new({code: 200, parsed_response: {id: "pro", valid: true}})
-        else
-          HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
-        end
+        HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
       end
 
       def app_name

data/lib/avo/licensing/license.rb

@@ -6,7 +6,7 @@ module Avo
       attr_accessor :valid
       attr_accessor :payload
 
-      def initialize(response = {})
+      def initialize(response)
         @response = response
         @id = response["id"]
         @valid = response["valid"]

data/lib/avo/licensing/license_manager.rb

@@ -12,7 +12,7 @@ module Avo
         when "pro"
           ProLicense.new @hq_response
         else
-          NilLicense.new @hq_response
+          NullLicense.new @hq_response
         end
       end
 

data/lib/avo/licensing/{nil_license.rb → null_license.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Licensing
-    class NilLicense < License
+    class NullLicense < License
       def initialize(response = nil)
         response ||= {
           id: "community",

data/lib/avo/loaders/fields_loader.rb

@@ -6,7 +6,7 @@ module Avo
       end
 
       def method_missing(method, *args, &block)
-        matched_field = Avo.field_manager.find do |field|
+        matched_field = Avo::App.fields.find do |field|
           field[:name].to_s == method.to_s
         end
 
@@ -22,12 +22,6 @@ module Avo
           add_field field
         end
       end
-
-      def respond_to_missing?(method)
-        Avo.field_manager.find do |field|
-          field[:name].to_s == method.to_s
-        end
-      end
     end
   end
 end

data/lib/avo/plugin.rb

@@ -2,15 +2,5 @@ module Avo
   class Plugin
     def initialize(*, **, &block)
     end
-
-    class << self
-      def version
-        "#{namespace}::VERSION".safe_constantize
-      end
-
-      def namespace
-        to_s.split("::").first
-      end
-    end
   end
 end

data/lib/avo/plugin_manager.rb

@@ -25,13 +25,15 @@ module Avo
     end
 
     def register_field(method_name, klass)
-      Avo.field_manager.load_field method_name, klass
+      Avo::App.fields.load_field method_name, klass
     end
 
     def register_resource_tool
+      # puts ["register_resource_tool->"].inspect
     end
 
     def register_tool
+      # puts ["register_tool->"].inspect
     end
 
     def as_json(*arg)
@@ -45,7 +47,7 @@ module Avo
 
     def installed?(name)
       plugins.any? do |plugin|
-        plugin.klass.to_s.chomp("::Plugin").underscore.tr("/", "-") == name.to_s
+        plugin.klass.to_s.split("::").first.underscore == name.to_s || plugin.klass.to_s.split("::").first == name.to_s
       end
     end
   end

data/lib/avo/reloader.rb

@@ -46,7 +46,7 @@ class Avo::Reloader
     if reload_lib?
       dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
       if Avo.avo_filters_installed?
-        dirs[Avo::DynamicFilters::Engine.root.join("lib", "avo", "dynamic_filters").to_s] = ["rb"]
+        dirs[AvoFilters::Engine.root.join("lib", "avo_filters").to_s] = ["rb"]
       end
     end
 

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

@@ -2,14 +2,13 @@ module Avo
   module Resources
     module Controls
       class ActionsList < BaseControl
-        attr_reader :color, :exclude, :include, :style
+        attr_reader :color, :exclude, :style
 
         def initialize(**args)
           super(**args)
 
           @color = args[:color] || :primary
           @exclude = args[:exclude] || []
-          @include = args[:include] || []
           @style = args[:style] || :outline
         end
       end

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

@@ -6,7 +6,7 @@ module Avo
           super(**args)
 
           if args[:item].present?
-            @label = I18n.t("avo.create_new_item", item: args[:item].humanize(capitalize: false)) if label.nil?
+            @label = I18n.t("avo.create_new_item", item: args[:item]) if label.nil?
           end
         end
       end

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

@@ -7,7 +7,7 @@ module Avo
 
           @label = args[:label] || I18n.t("avo.delete").capitalize
           if args[:item].present?
-            @title = I18n.t("avo.delete_item", item: args[:item]).humanize if title.nil?
+            @title = I18n.t("avo.delete_item", item: args[:item]).capitalize if title.nil?
             @confirmation_message = I18n.t("avo.are_you_sure") if confirmation_message.nil?
           end
         end

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

@@ -6,7 +6,7 @@ module Avo
           super(**args)
 
           if args[:item].present?
-            @title = I18n.t("avo.detach_item", item: args[:item]).humanize if title.nil?
+            @title = I18n.t("avo.detach_item", item: args[:item]).capitalize if title.nil?
             @confirmation_message = I18n.t("avo.are_you_sure_detach_item", item: args[:item]) if confirmation_message.nil?
           end
         end