avo 2.46.0 → 3.0.0.pre1

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

@@ -5,13 +5,12 @@ module Avo
 
       def initialize(id, **args, &block)
         args[:readonly] = true
+        args[:sortable] = 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
       end
     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,7 @@ module Avo
 
       attr_reader :arguments
 
-      delegate :params, to: Avo::App
+      delegate :params, to: Avo::Current
 
       class << self
         def decode_filters(filter_params)
@@ -21,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
@@ -68,14 +64,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/grid_collector.rb

@@ -1,7 +1,5 @@
 module Avo
   class GridCollector
-    include Avo::Concerns::HasFields
-
     attr_accessor :cover_field
     attr_accessor :title_field
     attr_accessor :body_field
@@ -13,24 +11,24 @@ module Avo
     end
 
     def cover(field_name, as:, **args, &block)
-      field_parser = Avo::Dsl::FieldParser.new(id: field_name, as: as, order_index: items_index, **args, &block).parse
+      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, order_index: items_index, **args, &block).parse
+      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, order_index: items_index, **args, &block).parse
+      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(model:, view:, resource:)
-      cover_field.hydrate(model: model, view: view, resource: resource) if cover_field.present?
-      title_field.hydrate(model: model, view: view, resource: resource) if title_field.present?
-      body_field.hydrate(model: model, view: view, resource: resource) if body_field.present?
+    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

data/lib/avo/html/builder.rb

@@ -19,9 +19,10 @@ 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
+  delegate :current_user, to: Avo::Current
 
   def initialize(record: nil, resource: nil)
     @wrapper_stack = {}
@@ -120,11 +121,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

@@ -6,7 +6,7 @@ module Avo
 
       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
@@ -69,7 +69,7 @@ module Avo
           app_name: app_name
         }
 
-        metadata = avo_metadata
+        metadata = Avo::Services::DebugService.avo_metadata
         if metadata[:resources_count] != 0
           result[:avo_metadata] = metadata
         end
@@ -77,44 +77,6 @@ module Avo
         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,13 +147,9 @@ 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}})
-        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
@@ -200,28 +158,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,

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"]
@@ -64,7 +64,7 @@ module Avo
         if id.present?
           id.humanize
         else
-          self.class.to_s.split('::').last.underscore.humanize.gsub ' license', ''
+          self.class.to_s.split("::").last.underscore.humanize.gsub " license", ""
         end
       end
     end

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/licensing/pro_license.rb

@@ -4,19 +4,13 @@ module Avo
       def abilities
         [
           :authorization,
-          :localization,
-          :custom_tools,
-          :custom_fields,
-          :resource_tools,
           :global_search,
           :enhanced_search_results,
           :searchable_associations,
           :resource_ordering,
           :dashboards,
           :menu_editor,
-          :stimulus_js_integration,
-          :resource_show_controls,
-          :branding,
+          :customizable_controls,
           :resource_sidebar,
           :advanced_fields
         ]

data/lib/avo/plugin.rb

@@ -0,0 +1,6 @@
+module Avo
+  class Plugin
+    def initialize(*, **, &block)
+    end
+  end
+end

data/lib/avo/plugin_manager.rb

@@ -0,0 +1,58 @@
+module Avo
+  class PluginManager
+    attr_reader :plugins
+
+    alias_method :all, :plugins
+
+    def initialize
+      @plugins = []
+    end
+
+    def register(plugin_klass, priority: 10)
+      @plugins << OpenStruct.new(klass: plugin_klass, priority: priority)
+    end
+
+    def boot_plugins
+      Avo.plugin_manager.all.sort_by(&:priority).each do |plugin|
+        plugin.klass.boot
+      end
+    end
+
+    def init_plugins
+      Avo.plugin_manager.all.sort_by(&:priority).each do |plugin|
+        plugin.klass.init
+      end
+    end
+
+    def register_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)
+      plugins.map do |plugin|
+        {
+          klass: plugin.klass.to_s,
+          priority: plugin.priority,
+        }
+      end
+    end
+
+    def installed?(name)
+      plugins.any? do |plugin|
+        plugin.klass.to_s.split("::").first.underscore == name.to_s || plugin.klass.to_s.split("::").first == name.to_s
+      end
+    end
+  end
+
+  def self.plugin_manager
+    @plugin_manager ||= PluginManager.new
+  end
+end

data/lib/avo/prefixed_test_helpers.rb

@@ -0,0 +1,20 @@
+#   This module is used to namespace all of the methods from Avo::TestHelpers.
+#
+#   It loops through all of the public instance methods from Avo::TestHelpers and defines new methods in the current
+# module with the same name but prefixed with "avo_".
+#
+#   For example, if Avo::TestHelpers has a public instance method called example_method, this code will define a new
+# method called avo_example_method in Avo::PrefixedTestHelpers module which when called will call example_method
+# with the same arguments.
+
+module Avo
+  module PrefixedTestHelpers
+    include Avo::TestHelpers
+
+    Avo::TestHelpers.public_instance_methods.each do |method|
+      define_method("avo_#{method}") do |**args|
+        send(method, **args)
+      end
+    end
+  end
+end

data/lib/avo/reloader.rb

@@ -45,6 +45,9 @@ class Avo::Reloader
     # watch the lib directory in Avo development
     if reload_lib?
       dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
+      if Avo.avo_filters_installed?
+        dirs[AvoFilters::Engine.root.join("lib", "avo_filters").to_s] = ["rb"]
+      end
     end
 
     dirs

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

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

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

@@ -0,0 +1,15 @@
+module Avo
+  module Resources
+    module Controls
+      class AttachButton < BaseControl
+        def initialize(**args)
+          super(**args)
+
+          if args[:item].present?
+            @label = I18n.t("avo.attach_item", item: args[:item]) if label.nil?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Avo
         def initialize(**args)
           super(**args)
 
-          @label = I18n.t("avo.go_back")
+          @label = args[:label] || I18n.t("avo.go_back")
         end
       end
     end

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

@@ -2,56 +2,22 @@ module Avo
   module Resources
     module Controls
       class BaseControl
-        def initialize(**args)
-          @args = args
-        end
-
-        def label
-          @args[:label] || @label
-        end
+        attr_reader :label, :title, :color, :style, :icon, :icon_class, :confirmation_message, :size, :as_index_control
 
-        def title
-          @args[:title]
-        end
-
-        def color
-          @args[:color] || :gray
-        end
-
-        def style
-          @args[:style] || :text
-        end
-
-        def icon
-          @args[:icon] || nil
-        end
-
-        def back_button?
-          is_a? Avo::Resources::Controls::BackButton
-        end
-
-        def edit_button?
-          is_a? Avo::Resources::Controls::EditButton
-        end
-
-        def delete_button?
-          is_a? Avo::Resources::Controls::DeleteButton
-        end
-
-        def actions_list?
-          is_a? Avo::Resources::Controls::ActionsList
-        end
-
-        def link_to?
-          is_a? Avo::Resources::Controls::LinkTo
-        end
-
-        def detach_button?
-          is_a? Avo::Resources::Controls::DetachButton
-        end
-
-        def action?
-          is_a? Avo::Resources::Controls::Action
+        def initialize(**args)
+          @label = args[:label]
+          @title = args[:title]
+          @color = args[:color] || :gray
+          @style = args[:style] || :text
+          @icon = args[:icon]
+          @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]
+        end
+
+        def type
+          self.class.name.demodulize.underscore.to_sym
         end
       end
     end