avo 3.0.0.pre13 → 3.0.0.pre14

data/app/components/avo/views/resource_index_component.rb

@@ -100,7 +100,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def attach_path
     current_path = CGI.unescape(request.env["PATH_INFO"]).split("/").select(&:present?)
 
-    Avo::App.root_path(paths: [*current_path, "new"])
+    Avo.root_path(paths: [*current_path, "new"])
   end
 
   def singular_resource_name
@@ -126,7 +126,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   def show_search_input
     return false unless authorized_to_search?
-    return false unless resource.search_query.present?
+    return false unless resource.class.search_query.present?
     return false if field&.hide_search_input
 
     true
@@ -143,7 +143,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def render_dynamic_filters_button
     return unless Avo.avo_filters_installed?
     return unless resource.has_filters?
-    return if AvoFilters.configuration.always_expanded
+    return if Avo::DynamicFilters.configuration.always_expanded
 
     a_button size: :sm,
       color: :primary,
@@ -152,12 +152,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
         controller: "avo-filters",
         action: "click->avo-filters#toggleFiltersArea",
       } do
-      AvoFilters.configuration.button_label
+      Avo::DynamicFilters.configuration.button_label
     end
   end
 
   def scopes_list
-    AvoPro::Scopes::ListComponent.new(
+    Avo::Pro::Scopes::ListComponent.new(
       scopes: scopes,
       resource: resource,
       turbo_frame: turbo_frame,
@@ -166,7 +166,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def can_render_scopes?
-    defined?(AvoPro)
+    defined?(Avo::Pro)
   end
 
   private
@@ -191,11 +191,11 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def header_visible?
-    search_query_present? || filters_present? || has_many_view_types? || (Avo.avo_filters_installed? && resource.has_filters? && AvoFilters.configuration.always_expanded)
+    search_query_present? || filters_present? || has_many_view_types? || (Avo.avo_filters_installed? && resource.has_filters? && Avo::DynamicFilters.configuration.always_expanded)
   end
 
   def search_query_present?
-    @resource.search_query.present?
+    @resource.class.search_query.present?
   end
 
   def filters_present?

data/app/controllers/avo/actions_controller.rb

@@ -20,10 +20,14 @@ module Avo
     end
 
     def handle
+      # puts ["action_params->", action_params].inspect
       resource_ids = action_params[:fields][:avo_resource_ids].split(",")
       @selected_query = action_params[:fields][:avo_selected_query]
 
+      # puts ["action_params[:fields]->", action_params[:fields]].inspect
+
       fields = action_params[:fields].except(:avo_resource_ids, :avo_selected_query)
+      # puts ["fields->", fields.to_h].inspect
 
       args = {
         fields: fields,
@@ -31,14 +35,14 @@ module Avo
         resource: resource
       }
 
-      unless @action.standalone
-        args[:records] = if @selected_query.present?
-          @resource.model_class.find_by_sql decrypted_query
-        else
-          @resource.find_record resource_ids, params: params
-        end
+      args[:records] = if @selected_query.present?
+        @resource.model_class.find_by_sql decrypted_query
+      else
+        @resource.find_record resource_ids, params: params
       end
 
+      puts ["args->", args].inspect
+
       performed_action = @action.handle_action(**args)
 
       respond performed_action.response
@@ -47,7 +51,7 @@ module Avo
     private
 
     def action_params
-      params.permit(:authenticity_token, :resource_name, :action_id, fields: {})
+      params.permit(:authenticity_token, :resource_name, :action_id, :button, fields: {})
     end
 
     def set_action

data/app/controllers/avo/application_controller.rb

@@ -7,10 +7,10 @@ module Avo
     end
 
     include Avo::InitializesAvo
-    include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
     include Avo::Concerns::Breadcrumbs
+    include Pagy::Backend
 
     protect_from_forgery with: :exception
     around_action :set_avo_locale
@@ -61,6 +61,49 @@ module Avo
 
     private
 
+    # Get the pluralized resource name for this request
+    # Ex: projects, teams, users
+    def resource_name
+      return params[:resource_name] if params[:resource_name].present?
+
+      return controller_name if controller_name.present?
+
+      begin
+        request.path
+          .match(/\/?#{Avo.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
+          .captures
+          .first
+      rescue
+      end
+    end
+
+    def related_resource_name
+      params[:related_name]
+    end
+
+    # Gets the Avo resource for this request based on the request from the `resource_name` "param"
+    # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User
+    def resource
+      resource = Avo.resource_manager.get_resource @resource_name.to_s.camelize.singularize
+
+      return resource if resource.present?
+
+      Avo.resource_manager.get_resource_by_controller_name @resource_name
+    end
+
+    def related_resource
+      # Find the field from the parent resource
+      field = @resource.get_field params[:related_name]
+
+      return field.use_resource if field&.use_resource.present?
+
+      reflection = @record._reflections[params[:related_name]]
+
+      reflected_model = reflection.klass
+
+      Avo.resource_manager.get_resource_by_model_class reflected_model
+    end
+
     def set_resource_name
       @resource_name = resource_name
     end
@@ -72,23 +115,18 @@ module Avo
     def set_resource
       raise ActionController::RoutingError.new "No route matches" if resource.nil?
 
-      @resource = resource.hydrate(params: params)
+      @resource = resource.new(view: action_name.to_sym, user: _current_user, params: params)
+
+      set_authorization
     end
 
     def set_related_resource
-      @related_resource = related_resource.hydrate(params: params)
+      @related_resource = related_resource.new(params: params, view: action_name.to_sym, user: _current_user, record: @related_record)
     end
 
     def set_record
       @record = @resource.find_record(params[:id], query: model_find_scope, params: params)
-    end
-
-    def model_find_scope
-      eager_load_files(@resource, model_scope)
-    end
-
-    def model_scope
-      @resource.class.find_scope
+      @resource.hydrate(record: @record)
     end
 
     def set_related_record
@@ -98,6 +136,16 @@ module Avo
       else
         @related_resource.find_record params[:related_id], query: eager_load_files(@related_resource, @record.send(association_name)), params: params
       end
+      @related_resource.hydrate(record: @related_record)
+    end
+
+    def model_find_scope
+      eager_load_files(@resource, model_scope)
+    end
+
+    def model_scope
+      # abort @resource.inspect
+      @resource.class.find_scope
     end
 
     def set_view
@@ -110,6 +158,7 @@ module Avo
 
       # If resource.record is nil, most likely the user is creating a new record.
       # In that case, to access resource.record in visible and readonly blocks we hydrate the resource with a new record.
+      # TODO: commented this
       @resource.hydrate(record: @record_to_fill) if @resource.record.nil?
     end
 
@@ -136,14 +185,6 @@ module Avo
       end
     end
 
-    def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user, record: @record)
-    end
-
-    def hydrate_related_resource
-      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, record: @related_record)
-    end
-
     def authorize_base_action
       class_to_authorize = @record || @resource.model_class
 
@@ -157,52 +198,16 @@ module Avo
       @authorization.set_record(class_to_authorize).authorize_action action_to_authorize.to_sym
     end
 
-    # Get the pluralized resource name for this request
-    # Ex: projects, teams, users
-    def resource_name
-      return params[:resource_name] if params[:resource_name].present?
-
-      return controller_name if controller_name.present?
-
-      begin
-        request.path
-          .match(/\/?#{Avo::App.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
-          .captures
-          .first
-      rescue
-      end
-    end
-
-    def related_resource_name
-      params[:related_name]
-    end
-
-    # Gets the Avo resource for this request based on the request from the `resource_name` "param"
-    # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User
-    def resource
-      resource = Avo::App.resources.get_resource @resource_name.to_s.camelize.singularize
-
-      return resource if resource.present?
-
-      Avo::App.resources.get_resource_by_controller_name @resource_name
-    end
-
-    def related_resource
-      # Find the field from the parent resource
-      field = @resource.get_field params[:related_name]
-
-      return field.use_resource if field&.use_resource.present?
-
-      reflection = @record._reflections[params[:related_name]]
-
-      reflected_model = reflection.klass
-
-      Avo::App.resources.get_resource_by_model_class reflected_model
-    end
-
     def eager_load_files(resource, query)
-      if resource.attached_file_fields.present?
-        resource.attached_file_fields.map do |field|
+      # Get the non-computed file fields and try to eager load them
+      attachment_fields = resource
+        .attachment_fields
+        .reject do |field|
+          field.computed
+        end
+
+      if attachment_fields.present?
+        attachment_fields.map do |field|
           attachment = case field.class.to_s
           when "Avo::Fields::FileField"
             "attachment"
@@ -238,8 +243,8 @@ module Avo
     def set_authorization
       # We need to set @resource_name for the #resource method to work properly
       set_resource_name
-      @authorization = if resource
-        resource.authorization(user: _current_user)
+      @authorization = if @resource
+        @resource.authorization(user: _current_user)
       else
         Services::AuthorizationService.new _current_user
       end

data/app/controllers/avo/associations_controller.rb

@@ -3,13 +3,11 @@ require_dependency "avo/base_controller"
 module Avo
   class AssociationsController < BaseController
     before_action :set_record, only: [:show, :index, :new, :create, :destroy]
-    before_action :hydrate_resource, only: [:show, :index, :new, :create, :destroy]
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy]
     before_action :set_related_authorization
     before_action :set_reflection_field
     before_action :set_related_record, only: [:show]
-    before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy]
     before_action :set_reflection
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy]
@@ -54,7 +52,7 @@ module Avo
         end
 
         @options = query.all.map do |record|
-          [@attachment_resource.hydrate(record: record).record_title, record.id]
+          [@attachment_resource.new(record: record).record_title, record.id]
         end
       end
     end
@@ -102,7 +100,7 @@ module Avo
     end
 
     def set_attachment_resource
-      @attachment_resource = @field.use_resource || (Avo::App.resources.get_resource_by_model_class @attachment_class)
+      @attachment_resource = @field.use_resource || (Avo.resource_manager.get_resource_by_model_class @attachment_class)
     end
 
     def set_attachment_record
@@ -151,8 +149,8 @@ module Avo
     private
 
     def set_related_authorization
-      @related_authorization = if related_resource
-        related_resource.authorization(user: _current_user)
+      @related_authorization = if @related_resource.present?
+        @related_resource.authorization(user: _current_user)
       else
         Services::AuthorizationService.new _current_user
       end

data/app/controllers/avo/attachments_controller.rb

@@ -7,7 +7,7 @@ module Avo
     before_action :set_record, only: [:destroy, :create]
 
     def create
-      blob = ActiveStorage::Blob.create_and_upload! io: params[:file], filename: params[:filename]
+      blob = ActiveStorage::Blob.create_and_upload! io: params[:file].to_io, filename: params[:filename]
       association_name = BaseResource.valid_attachment_name(@record, params[:attachment_key])
 
       if association_name.blank?

data/app/controllers/avo/base_controller.rb

@@ -6,7 +6,6 @@ module Avo
 
     before_action :set_resource_name
     before_action :set_resource
-    before_action :hydrate_resource
     before_action :set_applied_filters, only: :index
     before_action :set_record, only: [:show, :edit, :destroy, :update, :preview]
     before_action :set_record_to_fill
@@ -69,9 +68,9 @@ module Avo
 
       safe_call :set_and_apply_scopes
 
-      if Avo.avo_filters_installed? && params[AvoFilters.configuration.param_key].present?
+      if Avo.avo_filters_installed? && params[Avo::DynamicFilters.configuration.param_key].present?
         # Apply dynamic filters
-        query_builder = AvoFilters::QueryBuilder.new(resource: @resource, params: params, query: @query)
+        query_builder = Avo::DynamicFilters::QueryBuilder.new(resource: @resource, params: params, query: @query)
         @query = @query.ransack(**query_builder.ransack_query)
       end
 
@@ -98,9 +97,9 @@ module Avo
 
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_record_id].present?
-        via_resource = Avo::App.resources.get_resource(params[:via_resource_class]).dup
+        via_resource = Avo.resource_manager.get_resource(params[:via_resource_class])
         via_record = via_resource.find_record params[:via_record_id], params: params
-        via_resource.hydrate record: via_record
+        via_resource = via_resource.new record: via_record
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
         add_breadcrumb via_resource.record_title, resource_path(record: via_record, resource: via_resource)
@@ -121,9 +120,9 @@ module Avo
       @page_title = @resource.default_panel_name.to_s
 
       if is_associated_record?
-        via_resource = Avo::App.resources.get_resource_by_model_class(params[:via_relation_class]).dup
+        via_resource = Avo.resource_manager.get_resource_by_model_class(params[:via_relation_class])
         via_record = via_resource.find_record params[:via_record_id], params: params
-        via_resource.hydrate record: via_record
+        via_resource = via_resource.new record: via_record
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
         add_breadcrumb via_resource.record_title, resource_path(record: via_record, resource: via_resource)
@@ -146,7 +145,7 @@ module Avo
         # Fills in the required infor for belongs_to and has_many
         # Get the foreign key and set it to the id we received in the params
         if @reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection) || @reflection.is_a?(ActiveRecord::Reflection::HasManyReflection)
-          related_resource = Avo::App.resources.get_resource_by_model_class params[:via_relation_class]
+          related_resource = Avo.resource_manager.get_resource_by_model_class params[:via_relation_class]
           related_record = related_resource.find_record params[:via_record_id], params: params
 
           @record.send("#{@reflection.foreign_key}=", related_record.id)
@@ -156,7 +155,7 @@ module Avo
         # For when working with has_one, has_one_through, has_many_through, has_and_belongs_to_many, polymorphic
         if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
           # find the record
-          via_resource = ::Avo::App.resources.get_resource_by_model_class(params[:via_relation_class]).dup
+          via_resource = Avo.resource_manager.get_resource_by_model_class(params[:via_relation_class])
           @related_record = via_resource.find_record params[:via_record_id], params: params
           association_name = BaseResource.valid_association_name(@record, params[:via_relation])
 
@@ -215,16 +214,24 @@ module Avo
 
     def save_record
       perform_action_and_record_errors do
-        @record.save!
+        save_record_action
       end
     end
 
+    def save_record_action
+      @record.save!
+    end
+
     def destroy_model
       perform_action_and_record_errors do
-        @record.destroy!
+        destroy_record_action
       end
     end
 
+    def destroy_record_action
+      @record.destroy!
+    end
+
     def perform_action_and_record_errors(&block)
       begin
         succeeded = block.call
@@ -253,7 +260,7 @@ module Avo
     end
 
     def permitted_params
-      @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param).concat extra_params
+      @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param).concat(extra_params).uniq
     end
 
     def extra_params
@@ -404,9 +411,9 @@ module Avo
       last_crumb_args = {}
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_record_id].present?
-        via_resource = Avo::App.resources.get_resource(params[:via_resource_class]).dup
+        via_resource = Avo.resource_manager.get_resource(params[:via_resource_class])
         via_record = via_resource.find_record params[:via_record_id], params: params
-        via_resource.hydrate record: via_record
+        via_resource = via_resource.new record: via_record
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)
         add_breadcrumb via_resource.record_title, resource_path(record: via_record, resource: via_resource)
@@ -447,7 +454,7 @@ module Avo
     def after_create_path
       # If this is an associated record return to the association show page
       if is_associated_record?
-        parent_resource = ::Avo::App.resources.get_resource_by_model_class(params[:via_relation_class]).dup
+        parent_resource = Avo.resource_manager.get_resource_by_model_class(params[:via_relation_class])
         association_name = BaseResource.valid_association_name(@record, params[:via_relation])
 
         return resource_view_path(

data/app/controllers/avo/home_controller.rb

@@ -14,7 +14,7 @@ module Avo
         redirect_to computed_path
       elsif !Rails.env.development?
         @page_title = "Get started"
-        resource = Avo::Current.app.resource_manager.all.min_by { |resource| resource.model_key }
+        resource = Avo.resource_manager.all.min_by { |resource| resource.model_key }
         redirect_to resources_path(resource: resource)
       end
     end

data/app/controllers/avo/search_controller.rb

@@ -37,7 +37,7 @@ module Avo
       query = Avo::ExecutionContext.new(
         target: resource.search_query,
         params: params,
-        query: resource.class.query_scope
+        query: resource.query_scope
       ).handle
 
       # Get the count
@@ -101,18 +101,21 @@ module Avo
     # This scope is applied if the search is being performed on a has_many association
     def apply_has_many_scope
       association_name = BaseResource.valid_association_name(parent, params[:via_association_id])
+
+      # Get association records
       query = parent.send(association_name)
 
-      Avo::ExecutionContext.new(target: @resource.search_query, params: params, query: query).handle
+      # Apply policy scope if authorization is present
+      query = resource.authorization&.apply_policy query
+
+      Avo::ExecutionContext.new(target: @resource.class.search_query, params: params, query: query).handle
     end
 
     def apply_search_metadata(records, avo_resource)
       records.map do |record|
-        # TODO: refactor this
-        # resource = avo_resource.dup.hydrate(record: record).hydrate_fields
-        resource = avo_resource.dup.hydrate(record: record)
+        resource = avo_resource.new(record: record)
 
-        fetch_result_information record, resource, resource.fetch_search(:item)
+        fetch_result_information record, resource, resource.class.fetch_search(:item, record: record)
       end
     end
 
@@ -122,12 +125,12 @@ module Avo
       {
         _id: record.id,
         _label: item&.dig(:title) || resource.record_title,
-        _url: resource.fetch_search(:result_path) || resource.record_path
+        _url: resource.class.fetch_search(:result_path, record: resource.record) || resource.record_path
       }
     end
 
     def should_apply_has_many_scope?
-      params[:via_association] == "has_many" && @resource.search_query.present?
+      params[:via_association] == "has_many" && @resource.class.search_query.present?
     end
 
     def should_apply_attach_scope?
@@ -151,16 +154,15 @@ module Avo
     end
 
     def fetch_field
-      fields = ::Avo::App.resources.get_resource_by_model_class(params[:via_reflection_class]).get_field_definitions
+      fields = Avo.resource_manager.get_resource_by_model_class(params[:via_reflection_class]).new.get_field_definitions
       fields.find { |f| f.id.to_s == params[:via_association_id] }
     end
 
     def fetch_parent
       return unless params[:via_reflection_id].present?
 
-      parent_class = BaseResource.get_model_by_name params[:via_reflection_class]
-
-      parent_class.find params[:via_reflection_id]
+      parent_resource = Avo.resource_manager.get_resource_by_model_class params[:via_reflection_class]
+      parent_resource.find_record params[:via_reflection_id], params: params
     end
   end
 end

data/app/controllers/concerns/avo/initializes_avo.rb

@@ -1,16 +1,13 @@
 module Avo
   module InitializesAvo
     def init_app
-      Avo::Current.license = Avo::Licensing::NullLicense.new
+      Avo::Current.license = Avo::Licensing::NilLicense.new
       Avo::Current.context = context
       Avo::Current.current_user = _current_user
       Avo::Current.view_context = view_context
-      Avo::Current.app = Avo::App.build request: request, context: context, current_user: _current_user, view_context: view_context
-      Avo::Current.app.init
+      Avo.init
       Avo::Current.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
       Avo.plugin_manager.init_plugins
-
-      @license = Avo::App.license
     end
 
     def _current_user

data/app/javascript/js/controllers/fields/easy_mde_controller.js

@@ -20,6 +20,7 @@ export default class extends Controller {
     const options = {
       element: this.elementTarget,
       spellChecker: this.componentOptions.spell_checker,
+      autoRefresh: { delay: 500},
     }
 
     if (this.view === 'show') {

data/app/views/avo/associations/new.html.erb

@@ -17,7 +17,7 @@
 
       <div class="flex-1 flex items-center justify-center px-0 lg:px-8 text-lg mt-8 mb-12">
         <% if @field.is_searchable? %>
-          <%= render AvoPro::SearchableAssociations::AutocompleteComponent.new form: form,
+          <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: form,
             classes: input_classes("w-full"),
             field: @field,
             model_key: @field.target_resource&.model_key,

data/app/views/avo/debug/status.html.erb

@@ -1,5 +1,5 @@
 <%
-  license = Avo::App.license
+  license = Avo.license
   information_items = [
     'license_key',
     'ruby_version',

data/app/views/avo/partials/_custom_tools_alert.html.erb

@@ -5,8 +5,8 @@
     </a>
   </div>
 <% end %>
-<% if Avo::App.errors.has_errors?.present? %>
-  <% Avo::App.errors.all.each do |error| %>
+<% if Avo.error_manager.has_errors?.present? %>
+  <% Avo.error_manager.all.each do |error| %>
     <% if error.is_a? Hash %>
       <%
         url, message, target = error.values_at :url, :message, :target

data/app/views/avo/partials/_footer.html.erb

@@ -1,3 +1,3 @@
 <div class="text-center text-sm text-gray-700 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>">
-  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo::App.license.valid ? 'valid' : 'invalid'%> <%= Avo::App.license.id %> license">v<%= Avo::VERSION %></span>
+  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo.license.valid ? 'valid' : 'invalid'%> <%= Avo.license.id %> license">v<%= Avo::VERSION %></span>
 </div>

data/app/views/avo/partials/_javascript.html.erb

@@ -6,7 +6,7 @@
   Avo.configuration.cookies_key = '<%= Avo::COOKIES_KEY %>'
   <% if Avo.avo_filters_installed? %>
   Avo.configuration.avo_filters = {
-    param_key: '<%= AvoFilters.configuration.param_key %>'
+    param_key: '<%= Avo::DynamicFilters.configuration.param_key %>'
   }
   <% end %>
 <% end %>

data/app/views/avo/partials/_navbar.html.erb

@@ -10,7 +10,7 @@
     <%= render partial: "avo/partials/logo" %>
   </div>
   <div class="flex-1 flex items-center justify-between lg:justify-start space-x-2 sm:space-x-8 lg:px-2">
-    <%= render AvoPro::GlobalSearchComponent.new rescue nil %>
+    <%= render Avo::Pro::GlobalSearchComponent.new rescue nil %>
     <div class="m-0">
       <%= render partial: "avo/partials/header" %>
     </div>

data/app/views/layouts/avo/application.html.erb

@@ -60,8 +60,8 @@
     <%= render partial: "avo/partials/scripts" %>
     <!-- Avo version: <%= Avo::VERSION %> -->
     <!-- Environment: <%= Rails.env %> -->
-    <!-- License ID: <%= Avo::App.license.id %> -->
-    <!-- License valid?: <%= Avo::App.license.valid ? "valid" : "invalid" %>  -->
+    <!-- License ID: <%= Avo.license.id %> -->
+    <!-- License valid?: <%= Avo.license.valid ? "valid" : "invalid" %>  -->
   </body>
 </html>
 <!-- ✨ Built with Avo • https://www.avohq.io/ -->

data/avo.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
   spec.add_dependency "activerecord", ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.1"
   spec.add_dependency "actionview", ">= 6.1"
   spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk", ">= 2.6.2"