avo 2.48.0 → 3.0.0.beta1

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?(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/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/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/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(turbo_frame: turbo_frame)
           .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.hydrate(record: value).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
 
@@ -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,14 @@ 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_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,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

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

@@ -6,7 +6,7 @@ module Avo
       def initialize(id, **args, &block)
         args[:readonly] = true
 
-        hide_on [:edit, :new]
+        hide_on :forms
 
         super(id, **args, &block)
 

data/lib/avo/fields/location_field.rb

@@ -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

@@ -17,6 +17,10 @@ module Avo
 
         status
       end
+
+      def options_for_filter
+        [@failed_when, @loading_when].flatten
+      end
     end
   end
 end

data/lib/avo/filters/base_filter.rb

@@ -12,7 +12,12 @@ module Avo
 
       attr_reader :arguments
 
-      delegate :params, to: Avo::App
+      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)
@@ -68,14 +73,13 @@ module Avo
         return true if visible.blank?
 
         # Run the visible block if available
-        Avo::Hosts::VisibilityHost.new(
-          block: visible,
+        Avo::ExecutionContext.new(
+          target: visible,
           params: params,
           parent_resource: parent_resource,
           resource: resource,
           arguments: arguments
         ).handle
-
       end
     end
   end

data/lib/avo/html/builder.rb

@@ -19,9 +19,12 @@ class Avo::HTML::Builder
   attr_accessor :record
   attr_accessor :resource
 
-  delegate :root_path, to: Avo::App
-  delegate :params, to: Avo::App
-  delegate :current_user, to: Avo::App
+  delegate :app, to: Avo::Current
+  delegate :root_path, to: :app
+  delegate :params, to: Avo::Current
+  def curent_user
+    Avo::Current.user
+  end
 
   def initialize(record: nil, resource: nil)
     @wrapper_stack = {}
@@ -120,11 +123,7 @@ class Avo::HTML::Builder
 
   # Parse the properties and assign them to the blocks
   def assign_property(property = :data, payload = nil, &block)
-    value = if block.present?
-      Avo::Hosts::RecordHost.new(block: block, record: record).handle
-    else
-      payload
-    end
+    value = Avo::ExecutionContext.new(target: block || payload, record: record).handle
 
     send("#{property}_stack=", value)
   end

data/lib/avo/item_grapher.rb

@@ -0,0 +1,78 @@
+# Use it like this:
+# Avo::ItemGrapher.new(resource).render(view: :edit)
+class Avo::ItemGrapher
+  attr_reader :item
+
+  def initialize(item)
+    @item = item
+  end
+
+  def decode_item(item)
+    result = ""
+    result << "──" * (item[:level])
+    result << "→"
+    result << item[:id]
+    if item[:items].present?
+      item[:items].each do |itm|
+        result << "<br />"
+        result << decode_item(itm)
+      end
+
+    end
+    result
+  end
+
+  def unwrap(i, level = 0, view: :show)
+    result = []
+
+    i.items.each do |item|
+      label = ""
+      label << item.class.name.demodulize
+      label << " "
+      if item.respond_to?(:name)
+        label << "{#{item.name}}"
+        label << " "
+      end
+      label << (item.hydrate(view: view).visible_in_view?(view: view) ? "visible" : "invisible")
+      if item.class.ancestors.include?(Avo::Concerns::HasItems)
+        if item.visible_items.present?
+          label << " | HAS_ITEMS #{item.visible_items.count} items"
+          # abort item.visible_items.inspect
+          label << item.visible_items.map(&:class).inspect
+        else
+          label << " | DOES_NOT_HAVE_ITEMS"
+        end
+      end
+      if item.respond_to?(:is_empty?)
+        label << " "
+        label << (item.is_empty? ? "[IS EMPTY!]" : "[#{item.visible_items.count}]")
+      end
+      payload = if item.respond_to?(:items) && item.items.present?
+        {
+          id: label,
+          items: unwrap(item, level + 1),
+        }
+      else
+        {
+          id: label
+        }
+      end
+
+      result << {
+        **payload,
+        level: level,
+      }
+    end
+
+    result
+  end
+
+  def render(**args)
+    result = unwrap(item, **args)
+      .map do |item|
+        decode_item(item)
+      end
+      .join("<br />")
+    "<pre>#{result}</pre>".html_safe
+  end
+end

data/lib/avo/licensing/h_q.rb

@@ -4,9 +4,10 @@ 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*12 unless const_defined?(:CACHE_TIME) # seconds
+      CACHE_TIME = 3600 unless const_defined?(:CACHE_TIME) # seconds
 
       class << self
         def cache_key
@@ -16,7 +17,7 @@ module Avo
 
       def initialize(current_request = nil)
         @current_request = current_request
-        @cache_store = Avo::App.cache_store
+        @cache_store = Avo.cache_store
       end
 
       def response
@@ -69,52 +70,14 @@ module Avo
           app_name: app_name
         }
 
-        metadata = 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
 
-      def avo_metadata
-        resources = App.resources
-        dashboards = App.dashboards
-        field_definitions = resources.map(&:get_field_definitions)
-        fields_count = field_definitions.map(&:count).sum
-        fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
-
-        field_types = {}
-        custom_fields_count = 0
-        field_definitions.each do |fields|
-          fields.each do |field|
-            field_types[field.type] ||= 0
-            field_types[field.type] += 1
-
-            custom_fields_count += 1 if field.custom?
-          end
-        end
-
-        {
-          resources_count: resources.count,
-          dashboards_count: dashboards.count,
-          fields_count: fields_count,
-          fields_per_resource: fields_per_resource,
-          custom_fields_count: custom_fields_count,
-          field_types: field_types,
-          **other_metadata(:actions),
-          **other_metadata(:filters),
-          main_menu_present: Avo.configuration.main_menu.present?,
-          profile_menu_present: Avo.configuration.profile_menu.present?,
-          cache_store: Avo::App.cache_store&.class&.to_s,
-          **config_metadata
-        }
-      rescue => e
-        {
-          error: e.message
-        }
-      end
-
       def cached_response
         cache_store.read self.class.cache_key
       end
@@ -185,7 +148,7 @@ module Avo
       end
 
       def perform_request
-        ::Rails.logger.debug "[Avo] Performing request to avohq.io API to check license availability." if Rails.env.development?
+        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}})
@@ -200,28 +163,6 @@ module Avo
         nil
       end
 
-      def other_metadata(type = :actions)
-        resources = App.resources
-
-        types = resources.map(&:"get_#{type}")
-        type_count = types.flatten.uniq.count
-        type_per_resource = sprintf("%0.01f", types.map(&:count).sum / (resources.count + 0.0))
-
-        {
-          "#{type}_count": type_count,
-          "#{type}_per_resource": type_per_resource
-        }
-      end
-
-      def config_metadata
-        {
-          config: {
-            root_path: Avo.configuration.root_path,
-            app_name: Avo.configuration.app_name
-          }
-        }
-      end
-
       def cache_and_return_error(error, exception_message = "")
         cache_response response: {
           id: Avo.configuration.license,