avo 3.30.4 → 4.0.0.beta.1

data/lib/avo/services/hq_reporter.rb

@@ -0,0 +1,102 @@
+require "net/http"
+
+module Avo
+  module Services
+    class HqReporter
+      ENDPOINT = "https://v3.avohq.io/api/v3/licenses/check".freeze unless const_defined?(:ENDPOINT)
+      REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
+      CACHE_TIME = 24.hours.to_i unless const_defined?(:CACHE_TIME) # seconds
+
+      class << self
+        def cache_key
+          "avo.hq_reporter-#{Avo::VERSION.parameterize}.reported"
+        end
+
+        # Fire and forget - call this from a thread
+        # request_info should be a hash with :ip, :host, :port keys
+        def report(request_info = {})
+          return unless should_report?
+
+          cache_store.write(cache_key, {reported_at: Time.now}, expires_in: CACHE_TIME)
+
+          perform_request(request_info)
+        rescue
+          # Silently swallow all errors
+        end
+
+        private
+
+        def should_report?
+          return false unless Rails.env.production?
+          return false if Avo.plugin_manager.installed?("avo-licensing")
+          return false if already_reported?
+
+          true
+        end
+
+        def already_reported?
+          cached = cache_store.read(cache_key)
+          return false unless cached.present?
+
+          # Handle cache stores that don't auto-expire
+          reported_at = cached[:reported_at] || cached["reported_at"]
+          return false unless reported_at
+
+          Time.parse(reported_at.to_s) > Time.now - CACHE_TIME
+        rescue
+          false
+        end
+
+        def cache_store
+          Avo.configuration.cache_store
+        end
+
+        def payload(request_info)
+          result = {
+            license_key: Avo.configuration.license_key,
+            avo_version: Avo::VERSION,
+            rails_version: Rails::VERSION::STRING,
+            ruby_version: RUBY_VERSION,
+            environment: Rails.env,
+            ip: request_info[:ip],
+            host: request_info[:host],
+            port: request_info[:port],
+            app_name: app_name
+          }
+
+          if Avo.configuration.send_metadata
+            begin
+              result[:avo_metadata] = Avo::Services::TelemetryService.avo_metadata
+            rescue => e
+              result[:avo_metadata] = {
+                error_message: e.message,
+                error: "Failed to generate the Avo metadata"
+              }
+            end
+          else
+            result[:avo_metadata] = :disabled
+          end
+
+          result
+        end
+
+        def perform_request(request_info)
+          uri = URI.parse(ENDPOINT)
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = (uri.scheme == "https")
+          http.read_timeout = REQUEST_TIMEOUT
+          http.open_timeout = REQUEST_TIMEOUT
+          request = Net::HTTP::Post.new(uri.request_uri, {"Content-Type" => "application/json"})
+          request.body = payload(request_info).to_json
+          http.request(request)
+        end
+
+        def app_name
+          Rails.application.class.to_s.split("::").first
+        rescue
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/avo/services/telemetry_service.rb

@@ -2,7 +2,6 @@ class Avo::Services::TelemetryService
   class << self
     def telemetry_info
       {
-        # license: Avo.configuration.license,
         # license_key: Avo.configuration.license_key,
         avo_version: Avo::VERSION,
         rails_version: Rails::VERSION::STRING,

data/lib/avo/test_helpers.rb

@@ -28,7 +28,7 @@ module Avo
     #   show_field_wrapper(id: "name", type: "text")
     #   show_field_wrapper(id: "name")
     def show_field_wrapper(id:, type: nil)
-      base_data = "[data-panel-id='main'] [data-field-id='#{id}']"
+      base_data = "[data-field-id='#{id}']"
 
       if type.present?
         find("#{base_data}[data-resource-show-target='#{wrapper_name_for(id: id, type: type)}']")
@@ -93,21 +93,8 @@ module Avo
       "—"
     end
 
-    # Example usage:
-    #   click_resource_search_input # opens the first search box on the given page
-    #   opens the search box for the "users" resource
-    #   within(has_and_belongs_to_many_field_wrapper(id: :users)) {
-    #     click_resource_search_input
-    #     write_in_search("Bob")
-    #   }
-    def click_resource_search_input
-      first("[data-search-resource]:not([data-search-resource='global'])").click
-      wait_for_search_loaded
-    end
-
     def click_global_search_input
-      page.find(:xpath, "//*[contains(@class, 'global-search')]").click
-      wait_for_search_loaded
+      page.find("[data-global-search-target='input']").click
     end
 
     # Should use the click_global_search_input or click_resource_search_input method to open the search box first.
@@ -119,10 +106,15 @@ module Avo
     #   }
     def write_in_search(input)
       # Use xpath to find outside of within context if any
-      find(:xpath, "//input[@class='aa-Input']").set(input)
+      find('[data-resource-search-target="input"]').set(input)
       wait_for_search_loaded
     end
 
+    def write_in_global_search(input)
+      page.find("[data-global-search-target='input']").set(input)
+    end
+
+    # TODO: this will make sense only on global search
     # Should use the click_global_search_input or click_resource_search_input method to open the search box first and optionaly write_in_search.
     # Example usage:
     #   open_search_box(:users) # opens the search box for the "users" resource
@@ -142,7 +134,7 @@ module Avo
     # Sometimes other element may be overlapping the button so the `.trigger("click")` solves the issue
     # Trigger can't be used by default because it breaks on some feature specs
     def save
-      button = find("button.button-component", text: "Save")
+      button = find("button.button", text: "Save")
       button.click
     rescue Capybara::Cuprite::MouseEventFailed
       button.trigger("click")
@@ -151,14 +143,16 @@ module Avo
     end
 
     def click_tab(tab_name = "", within_target: nil, **args)
+      tab_container_selector = '[data-controller="tabs"] [role="tablist"]'
+
       if within_target.present?
         within within_target do
-          within find('[data-controller="tabs"] [data-tabs-target="tabSwitcher"]') do
+          within find(tab_container_selector) do
             find_link(tab_name).trigger("click")
           end
         end
       else
-        within find('[data-controller="tabs"] [data-tabs-target="tabSwitcher"]') do
+        within find(tab_container_selector) do
           find_link(tab_name).trigger("click")
         end
       end
@@ -192,6 +186,22 @@ module Avo
       sleep 0.2
     end
 
+    def set_picker_dates(input, *dates)
+      page.execute_script(
+        "arguments[0]._flatpickr.setDate(arguments[1], true)",
+        input.native,
+        (dates.length == 1) ? dates.first : dates
+      )
+    end
+
+    def set_picker_time(input, hour:, minute: 0, second: 0)
+      page.execute_script(
+        "arguments[0]._flatpickr.setDate(arguments[1], true)",
+        input.native,
+        "#{hour}:#{minute}:#{second}"
+      )
+    end
+
     def set_picker_hour(value)
       find(".flatpickr-hour").set(value)
     end
@@ -215,7 +225,7 @@ module Avo
     end
 
     def close_picker
-      find('[data-target="title"]').trigger("click")
+      all(".header__title").first.trigger("click")
       sleep 0.3
     end
 
@@ -227,7 +237,7 @@ module Avo
     #   open_panel_action(list: nil, action_name: "Release fish")
     #   open_panel_action(list: "Runnables", action_name: "Release fish")
     def open_panel_action(action_name:, list: "Actions")
-      open_action(action_name: action_name, list: list, context: first("[data-target='panel-tools']"))
+      open_action(action_name: action_name, list: list, context: first(".header__controls"))
     end
 
     # Open the action from the record_id row
@@ -363,7 +373,7 @@ module Avo
         if list.present?
           sleep 0.1
           click_on list
-          within("[data-toggle-target='panel']") do
+          within("[data-dropdown-list='#{list}']", visible: :all) do
             find("a[data-action-name='#{action_name}']").click
           end
         else
@@ -382,5 +392,9 @@ module Avo
     def row(id)
       "[data-component-name='avo/index/table_row_component'][data-resource-id='#{id}']"
     end
+
+    def strip_html(text)
+      text.strip.gsub(/\s+/, " ")
+    end
   end
 end

data/lib/avo/u_i_instance.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class Avo::UIInstance
+  unless defined?(MISSING_COMPONENT_CLASS)
+    MISSING_COMPONENT_CLASS = "Avo::ComponentMissingComponent"
+  end
+
+  # Cache for resolved component classes to avoid repeated classify/constantize calls
+  @component_cache = {}
+  @cache_mutex = Mutex.new
+
+  class << self
+    def resolve_component(method)
+      # Check cache first (thread-safe read)
+      cached = @component_cache[method]
+      return cached if cached
+
+      # Cache miss - resolve and store (thread-safe write)
+      @cache_mutex.synchronize do
+        # Double-check after acquiring lock
+        return @component_cache[method] if @component_cache[method]
+
+        component_class = "#{method.to_s.delete_suffix("_component")}_component"
+        full_class_name = "Avo::#{component_class.classify}"
+        ui_full_class_name = "Avo::UI::#{component_class.classify}"
+
+        resolved = if Object.const_defined?(full_class_name)
+          full_class_name.constantize
+        elsif Object.const_defined?(ui_full_class_name)
+          ui_full_class_name.constantize
+        end
+
+        @component_cache[method] = resolved
+      end
+    end
+
+    def clear_cache!
+      @cache_mutex.synchronize { @component_cache.clear }
+    end
+
+    # Used in parent apps like this `ui.panel(...)`
+    # @method: string "panel"
+    # @return: (method: String) -> Component
+    def method_missing(method, ...)
+      component_class = resolve_component(method)
+
+      if component_class
+        component_class.new(...)
+      else
+        MISSING_COMPONENT_CLASS.safe_constantize.new(component_name: method)
+      end
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      # Since method_missing always handles any method call (either with a real component
+      # or falling back to MISSING_COMPONENT_CLASS), respond_to? should return true
+      true
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.30.4" unless const_defined?(:VERSION)
+  VERSION = "4.0.0.beta.1" unless const_defined?(:VERSION)
 end

data/lib/avo/view_inquirer.rb

@@ -10,6 +10,7 @@ module Avo
 
       @display = in? DISPLAY_VIEWS
       @form = in? FORM_VIEWS
+      @single = in? [*FORM_VIEWS, :show].compact.uniq
     end
 
     def display?
@@ -20,12 +21,16 @@ module Avo
       @form
     end
 
+    def single?
+      @single
+    end
+
     # To avoid breaking changes we allow the comparison with symbols
     def ==(other)
       if other.is_a? Symbol
         to_sym == other
       else
-        super(other)
+        super
       end
     end
 

data/lib/avo/view_types/view_type_manager.rb

@@ -0,0 +1,70 @@
+module Avo
+  module ViewTypes
+    class ViewTypeManager
+      attr_reader :registry
+
+      def initialize
+        @registry = {}
+      end
+
+      def register(name, component:, icon:, active_icon:, translation_key: nil)
+        @registry[name.to_sym] = {
+          component: component,
+          icon: icon,
+          active_icon: active_icon,
+          translation_key: translation_key
+        }
+      end
+
+      def find(name)
+        @registry[name.to_sym]
+      end
+
+      def component_for(name)
+        entry = find(name)
+
+        raise Avo::ViewTypeComponentNotFoundError, "No component registered for view type '#{name}'" unless entry
+
+        component = entry[:component]
+        component.is_a?(String) ? component.constantize : component
+      end
+
+      def registered?(name)
+        @registry.key?(name.to_sym)
+      end
+
+      def reset
+        @registry = {}
+        register_defaults
+      end
+
+      private
+
+      def register_defaults
+        register :table,
+          component: Avo::ViewTypes::TableComponent,
+          icon: "tabler/outline/layout-list",
+          active_icon: "tabler/filled/layout-list"
+
+        register :grid,
+          component: Avo::ViewTypes::GridComponent,
+          icon: "tabler/outline/layout-grid",
+          active_icon: "tabler/filled/layout-grid"
+
+        register :map,
+          component: Avo::ViewTypes::MapComponent,
+          icon: "tabler/outline/compass",
+          active_icon: "tabler/filled/compass"
+
+        register :list,
+          component: Avo::ViewTypes::TableComponent,
+          icon: "tabler/outline/layout-list",
+          active_icon: "tabler/filled/layout-list"
+      end
+    end
+  end
+
+  def self.view_type_manager
+    @view_type_manager ||= Avo::ViewTypes::ViewTypeManager.new.tap(&:reset)
+  end
+end

data/lib/avo.rb

@@ -1,6 +1,5 @@
 require "zeitwerk"
 require "net/http"
-require "active_support/inflector"
 require_relative "avo/version"
 require_relative "avo/engine" if defined?(Rails)
 
@@ -36,6 +35,8 @@ module Avo
 
   class DeprecatedAPIError < StandardError; end
 
+  class ViewTypeComponentNotFoundError < StandardError; end
+
   # Exception raised when a resource is missing
   class MissingResourceError < StandardError
     def initialize(model_class, field)
@@ -69,16 +70,19 @@ module Avo
     attr_reader :logger
     attr_reader :cache_store
     attr_reader :field_manager
-
-    delegate :license, :app, :error_manager, :tool_manager, :resource_manager, to: Avo::Current
+    delegate :app, :error_manager, :tool_manager, :resource_manager, to: Avo::Current
 
     # Runs when the app boots up
     def boot
       Turbo::Streams::TagBuilder.prepend(Avo::TurboStreamActionsHelper)
       @logger = Avo.configuration.logger
       @field_manager = Avo::Fields::FieldManager.build
+      @view_type_manager = nil # force re-init with defaults on next access
       @cache_store = Avo.configuration.cache_store
       Avo.plugin_manager.reset
+      # Run load hooks for plugins to include them in the app.
+      # This is useful for plugins that need to include modules in the app that will be used on avo_boot hook.
+      ActiveSupport.run_load_hooks(:avo_plugin_include, self)
       ActiveSupport.run_load_hooks(:avo_boot, self)
       eager_load_actions
     end
@@ -90,6 +94,7 @@ module Avo
       unless Rails.env.production?
         check_rails_version_issues
         display_menu_editor_warning
+        display_profile_menu_editor_warning
       end
       Avo::Current.resource_manager = Avo::Resources::ResourceManager.build
       Avo::Current.tool_manager = Avo::Tools::ToolManager.build
@@ -105,46 +110,14 @@ module Avo
         .to_s
     end
 
-    def main_menu
-      return unless Avo.plugin_manager.installed?("avo-menu")
-
-      # Return empty menu if the app doesn't have the profile menu configured
-      return Avo::Menu::Builder.new.build unless has_main_menu?
-
-      Avo::Menu::Builder.parse_menu(&Avo.configuration.main_menu)
-    end
-
-    def profile_menu
-      return unless Avo.plugin_manager.installed?("avo-menu")
-
-      # Return empty menu if the app doesn't have the profile menu configured
-      return Avo::Menu::Builder.new.build unless has_profile_menu?
-
-      Avo::Menu::Builder.parse_menu(&Avo.configuration.profile_menu)
-    end
-
     def app_status
-      license.valid?
+      true
     end
 
     def avo_dynamic_filters_installed?
       defined?(Avo::DynamicFilters).present?
     end
 
-    def has_main_menu?
-      return false if Avo.license.lacks_with_trial(:menu_editor)
-      return false if Avo.configuration.main_menu.nil?
-
-      true
-    end
-
-    def has_profile_menu?
-      return false if Avo.license.lacks_with_trial(:menu_editor)
-      return false if Avo.configuration.profile_menu.nil?
-
-      true
-    end
-
     def mount_engines
       -> {
         raise "'mount_engines' method is now obsolete. \n" \
@@ -162,7 +135,9 @@ module Avo
     end
 
     def check_rails_version_issues
-      if Rails.version.start_with?("7.1") && Avo.configuration.license.in?(["pro", "advanced"])
+      return if Rails.env.test?
+
+      if Rails.version.start_with?("7.1")
         Avo.error_manager.add({
           url: "https://docs.avohq.io/3.0/upgrade.html#upgrade-from-3-7-4-to-3-9-1",
           target: "_blank",
@@ -177,13 +152,23 @@ module Avo
     end
 
     def display_menu_editor_warning
-      if Avo.configuration.license == "community" && has_main_menu?
-        Avo.error_manager.add({
-          url: "https://docs.avohq.io/3.0/menu-editor.html",
-          target: "_blank",
-          message: "The menu editor is available exclusively with the Pro license or above. Consider upgrading to access this feature."
-        })
-      end
+      return if Avo.configuration.main_menu.nil?
+
+      Avo.error_manager.add({
+        url: "https://docs.avohq.io/3.0/menu-editor.html",
+        target: "_blank",
+        message: "The menu editor is available exclusively with the Pro license or above. Consider upgrading to access this feature."
+      })
+    end
+
+    def display_profile_menu_editor_warning
+      return if Avo.configuration.profile_menu.nil?
+
+      Avo.error_manager.add({
+        url: "https://docs.avohq.io/3.0/menu-editor.html#profile-menu",
+        target: "_blank",
+        message: "The profile menu editor is available exclusively with the Pro license or above. Consider upgrading to access this feature."
+      })
     end
   end
 end
@@ -192,4 +177,4 @@ def 🥑
   Avo
 end
 
-loader.eager_load if defined?(Rails)
+loader.eager_load

data/lib/generators/avo/action_generator.rb

@@ -15,7 +15,7 @@ module Generators
       end
 
       def configuration_options
-        configuration = "  self.name = \"#{options[:name] || name.titleize}\""
+        configuration = "  self.name = \"#{options[:name] || name.humanize}\""
         configuration += "\n  self.standalone = true" if options[:standalone]
 
         configuration

data/lib/generators/avo/resource_generator.rb

@@ -321,6 +321,49 @@ module Generators
         def field(name, type)
           ::Avo::Mappings::NAMES_MAPPING[name.to_sym] || ::Avo::Mappings::FIELDS_MAPPING[type&.to_sym] || {field: "text"}
         end
+
+        ICON_MAP = {
+          user: "tabler/outline/users",
+          customer: "tabler/outline/user",
+          transaction: "tabler/outline/credit-card-pay",
+          post: "tabler/outline/ballpen",
+          comment: "tabler/outline/message",
+          product: "tabler/outline/package",
+          order: "tabler/outline/shopping-cart",
+          category: "tabler/outline/folder",
+          tag: "tabler/outline/tag",
+          project: "tabler/outline/building-store",
+          team: "tabler/outline/users-group",
+          company: "tabler/outline/building",
+          invoice: "tabler/outline/file-invoice",
+          payment: "tabler/outline/cash",
+          article: "tabler/outline/article",
+          event: "tabler/outline/calendar-event",
+          notification: "tabler/outline/bell",
+          message: "tabler/outline/mail",
+          setting: "tabler/outline/settings",
+          report: "tabler/outline/chart-bar",
+          task: "tabler/outline/checklist",
+          review: "tabler/outline/star",
+          photo: "tabler/outline/photo",
+          image: "tabler/outline/photo",
+          video: "tabler/outline/video",
+          file: "tabler/outline/file",
+          document: "tabler/outline/file-text",
+          role: "tabler/outline/shield",
+          permission: "tabler/outline/lock",
+          subscription: "tabler/outline/credit-card",
+          plan: "tabler/outline/list",
+          address: "tabler/outline/map-pin",
+          location: "tabler/outline/map-pin",
+          country: "tabler/outline/globe",
+          city: "tabler/outline/building-community",
+          account: "tabler/outline/user-circle",
+        }.freeze
+
+        def icon_for_resource
+          ICON_MAP[singular_name.underscore.split("/").last.downcase.to_sym]
+        end
       end
     end
 

data/lib/generators/avo/resource_tool_generator.rb

@@ -32,7 +32,7 @@ module Generators
         end
 
         def in_code(text)
-          "<code class='p-1 rounded bg-gray-500 text-white text-sm'>#{text}</code>"
+          "<code class='p-1 rounded-sm bg-gray-500 text-white text-sm'>#{text}</code>"
         end
       end
     end

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -21,12 +21,6 @@ module Generators
             copy_file template_path("tailwind.config.js"), path
           end
 
-          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo", "tailwindcss")).exist?
-            say "Generating the tailwindcss directory."
-            directory ::Avo::Engine.root.join("app", "assets", "stylesheets", "css", "tailwindcss"), path
-          end
-
-
           unless (path = Rails.root.join("app", "assets", "stylesheets", "avo" ,"avo.tailwind.css")).exist?
             say "Add default tailwind.css"
             copy_file template_path("avo.tailwind.css"), path

data/lib/generators/avo/templates/cards/partial_card_partial.tt

@@ -5,6 +5,6 @@
     @dashboard: <%%= @dashboard %>
     <br />
     <br />
-    Customize this partial under <code class='p-1 rounded bg-gray-500 text-white text-sm'>app/views/avo/cards/_<%= name.underscore %>.html.erb</code>
+    Customize this partial under <code class='p-1 rounded-sm bg-gray-500 text-white text-sm'>app/views/avo/cards/_<%= name.underscore %>.html.erb</code>
   </div>
 </div>

data/lib/generators/avo/templates/initializer/avo.tt

@@ -106,12 +106,11 @@ Avo.configure do |config|
   # config.timezone = 'UTC'
   # config.currency = 'USD'
   # config.hide_layout_when_printing = false
-  # config.full_width_container = false
-  # config.full_width_index_view = false
+  # config.container_width = :large # :full, :large, or :small. Hash for per-view: { index: :full, single: :small }
+  # config.use_stacked_fields = false
   # config.search_debounce = 300
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
-  # config.disabled_features = []
   # config.buttons_on_form_footers = true
   # config.field_wrapper_layout = true
   # config.resource_parent_controller = "Avo::ResourcesController"
@@ -129,16 +128,15 @@ Avo.configure do |config|
   #     600 => "#066BB2",
   #   },
   #   chart_colors: ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"],
-  #   logo: "/avo-assets/logo.png",
-  #   logomark: "/avo-assets/logomark.png",
-  #   placeholder: "/avo-assets/placeholder.svg",
-  #   favicon: "/avo-assets/favicon.ico"
+  #   logo: "avo/logo.png",
+  #   logomark: "avo/logomark.png",
+  #   placeholder: "avo/placeholder.svg",
+  #   favicon: "avo/favicon.ico"
   # }
 
   ## == Breadcrumbs ==
-  # config.display_breadcrumbs = true
   # config.set_initial_breadcrumbs do
-  #   add_breadcrumb "Home", '/<%= options[:path] %>'
+  #   add_breadcrumb title: "Home", path: '/<%= options[:path] %>'
   # end
 
   ## == Menus ==