avo 3.0.0.beta1 → 3.0.0.pre1

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,49 +61,6 @@ 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
@@ -115,18 +72,23 @@ module Avo
     def set_resource
       raise ActionController::RoutingError.new "No route matches" if resource.nil?
 
-      @resource = resource.new(view: action_name.to_sym, user: _current_user, params: params)
-
-      set_authorization
+      @resource = resource.hydrate(params: params)
     end
 
     def set_related_resource
-      @related_resource = related_resource.new(params: params, view: action_name.to_sym, user: _current_user, record: @related_record)
+      @related_resource = related_resource.hydrate(params: params)
     end
 
     def set_record
       @record = @resource.find_record(params[:id], query: model_find_scope, params: params)
-      @resource.hydrate(record: @record)
+    end
+
+    def model_find_scope
+      eager_load_files(@resource, model_scope)
+    end
+
+    def model_scope
+      @resource.class.find_scope
     end
 
     def set_related_record
@@ -136,16 +98,6 @@ 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
@@ -155,34 +107,23 @@ module Avo
     def set_record_to_fill
       @record_to_fill = @resource.model_class.new if @view == :create
       @record_to_fill = @record if @view == :update
-
-      # 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
 
     def fill_record
       # We have to skip filling the the record if this is an attach action
-      return if is_attach_action?
+      is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
 
-      @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
-      assign_default_value_to_disabled_fields if @view == :create
+      unless is_attach_action
+        @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
+      end
     end
 
-    def is_attach_action?
-      params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
+    def hydrate_resource
+      @resource.hydrate(view: action_name.to_sym, user: _current_user, record: @record)
     end
 
-    def assign_default_value_to_disabled_fields
-      @resource.get_field_definitions.select do |field|
-        field.is_disabled? && field.visible? && !field.computed
-      end.each do |field|
-        # Get the default value from the field default definition
-        # If there is no default value specified on the resource, get the value from the record (DB, Callbacks, etc.)
-        default_value = field.default || @record.send(field.id)
-        field.fill_field @record, field.id, default_value, params
-      end
+    def hydrate_related_resource
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, record: @related_record)
     end
 
     def authorize_base_action
@@ -198,16 +139,52 @@ module Avo
       @authorization.set_record(class_to_authorize).authorize_action action_to_authorize.to_sym
     end
 
-    def eager_load_files(resource, query)
-      # Get the non-computed file fields and try to eager load them
-      attachment_fields = resource
-        .attachment_fields
-        .reject do |field|
-          field.computed
-        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
 
-      if attachment_fields.present?
-        attachment_fields.map do |field|
+    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|
           attachment = case field.class.to_s
           when "Avo::Fields::FileField"
             "attachment"
@@ -243,8 +220,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
@@ -308,7 +285,7 @@ module Avo
         if Rails::VERSION::MAJOR === 6
           ActiveStorage::Current.host = request.base_url
         elsif Rails::VERSION::MAJOR === 7
-          ActiveStorage::Current.url_options = {protocol: request.protocol, host: request.host, port: request.port}
+          ActiveStorage::Current.url_options = request.base_url
         end
       end
     rescue => exception

data/app/controllers/avo/associations_controller.rb

@@ -3,11 +3,13 @@ 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]
@@ -52,7 +54,7 @@ module Avo
         end
 
         @options = query.all.map do |record|
-          [@attachment_resource.new(record: record).record_title, record.id]
+          [record.send(@attachment_resource.class.title), record.id]
         end
       end
     end
@@ -79,7 +81,7 @@ module Avo
       association_name = BaseResource.valid_association_name(@record, params[:related_name])
 
       if reflection_class == "HasManyReflection"
-        @record.send(association_name).destroy @attachment_record
+        @record.send(association_name).delete @attachment_record
       else
         @record.send("#{association_name}=", nil)
       end
@@ -100,7 +102,7 @@ module Avo
     end
 
     def set_attachment_resource
-      @attachment_resource = @field.use_resource || (Avo.resource_manager.get_resource_by_model_class @attachment_class)
+      @attachment_resource = @field.use_resource || (Avo::App.resources.get_resource_by_model_class @attachment_class)
     end
 
     def set_attachment_record
@@ -149,8 +151,8 @@ module Avo
     private
 
     def set_related_authorization
-      @related_authorization = if @related_resource.present?
-        @related_resource.authorization(user: _current_user)
+      @related_authorization = if related_resource
+        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].to_io, filename: params[:filename]
+      blob = ActiveStorage::Blob.create_and_upload! io: params[:file], filename: params[:filename]
       association_name = BaseResource.valid_attachment_name(@record, params[:attachment_key])
 
       if association_name.blank?
@@ -23,31 +23,16 @@ module Avo
     end
 
     def destroy
-      if authorized_to :delete
-        attachment = ActiveStorage::Attachment.find(params[:attachment_id])
+      attachment = ActiveStorage::Attachment.find(params[:attachment_id])
+      path = resource_path(record: @record, resource: @resource)
 
-        flash[:notice] = if attachment.present?
-          @destroyed = attachment.destroy
+      if attachment.present?
+        attachment.destroy
 
-          t("avo.attachment_destroyed")
-        else
-          t("avo.failed_to_find_attachment")
-        end
+        redirect_to params[:referrer] || path, notice: t("avo.attachment_destroyed")
       else
-        flash[:notice] = t("avo.not_authorized")
+        redirect_back fallback_location: path, notice: t("avo.failed_to_find_attachment")
       end
-
-      respond_to do |format|
-        format.turbo_stream do
-          render "destroy"
-        end
-      end
-    end
-
-    private
-
-    def authorized_to(action)
-      @resource.authorization.authorize_action("#{action}_#{params[:attachment_name]}?", record: @record, raise_exception: false)
     end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -6,6 +6,7 @@ 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
@@ -28,6 +29,11 @@ module Avo
         @query = @resource.class.query_scope
       end
 
+      # Remove default_scope for index view if no parent_resource present
+      if @resource.unscoped_queries_on_index && @parent_resource.blank?
+        @query = @query.unscoped
+      end
+
       # Eager load the associations
       if @resource.includes.present?
         @query = @query.includes(*@resource.includes)
@@ -46,7 +52,7 @@ module Avo
         field_id = @index_params[:sort_by].to_sym
         field = @resource.get_field_definitions.find { |field| field.id == field_id }
         @query = if field&.sortable.is_a?(Proc)
-          Avo::ExecutionContext.new(target: field.sortable, query: @query, direction: @index_params[:sort_direction]).handle
+          field.sortable.call(@query, @index_params[:sort_direction])
         else
           @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
         end
@@ -67,7 +73,18 @@ module Avo
       end
 
       safe_call :set_and_apply_scopes
-      safe_call :apply_dynamic_filters
+
+      if Avo.avo_filters_installed? && params[AvoFilters.configuration.param_key].present?
+        # Apply dynamic filters
+        query_builder = AvoFilters::QueryBuilder.new(resource: @resource, params: params, query: @query)
+        @query = @query.ransack(**query_builder.ransack_query)
+      end
+
+      pagy_query = if @query.instance_of?(Ransack::Search)
+        @query.result(distinct: false)
+      else
+        @query
+      end
 
       @pagy, @records = pagy(pagy_query, items: @index_params[:per_page], link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"", size: [1, 2, 2, 1], params: extra_pagy_params)
 
@@ -78,7 +95,7 @@ module Avo
     end
 
     def show
-      @resource.hydrate(record: @record, view: :show, user: _current_user, params: params).detect_fields
+      @resource.hydrate(record: @record, view: :show, user: _current_user, params: params)
 
       set_actions
 
@@ -86,9 +103,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.resource_manager.get_resource(params[:via_resource_class])
+        via_resource = Avo::App.resources.get_resource(params[:via_resource_class]).dup
         via_record = via_resource.find_record params[:via_record_id], params: params
-        via_resource = via_resource.new record: via_record
+        via_resource.hydrate 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)
@@ -109,9 +126,9 @@ module Avo
       @page_title = @resource.default_panel_name.to_s
 
       if is_associated_record?
-        via_resource = Avo.resource_manager.get_resource_by_model_class(params[:via_relation_class])
+        via_resource = Avo::App.resources.get_resource_by_model_class(params[:via_relation_class]).dup
         via_record = via_resource.find_record params[:via_record_id], params: params
-        via_resource = via_resource.new record: via_record
+        via_resource.hydrate 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)
@@ -134,7 +151,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.resource_manager.get_resource_by_model_class params[:via_relation_class]
+          related_resource = Avo::App.resources.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)
@@ -144,16 +161,11 @@ 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.resource_manager.get_resource_by_model_class(params[:via_relation_class])
+          via_resource = ::Avo::App.resources.get_resource_by_model_class(params[:via_relation_class]).dup
           @related_record = via_resource.find_record params[:via_record_id], params: params
           association_name = BaseResource.valid_association_name(@record, params[:via_relation])
 
-          if params[:via_association_type] == "has_one"
-            # On has_one scenarios we should switch the @record and @related_record
-            @related_record.send("#{@reflection.parent_reflection.inverse_of.name}=", @record)
-          else
-            @record.send(association_name) << @related_record
-          end
+          @record.send(association_name) << @related_record
         end
       end
 
@@ -203,24 +215,16 @@ module Avo
 
     def save_record
       perform_action_and_record_errors do
-        save_record_action
+        @record.save!
       end
     end
 
-    def save_record_action
-      @record.save!
-    end
-
     def destroy_model
       perform_action_and_record_errors do
-        destroy_record_action
+        @record.destroy!
       end
     end
 
-    def destroy_record_action
-      @record.destroy!
-    end
-
     def perform_action_and_record_errors(&block)
       begin
         succeeded = block.call
@@ -249,7 +253,7 @@ module Avo
     end
 
     def permitted_params
-      @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param).concat(extra_params).uniq
+      @resource.get_field_definitions.select(&:updatable).map(&:to_permitted_param).concat extra_params
     end
 
     def extra_params
@@ -309,20 +313,8 @@ module Avo
       @index_params[:sort_direction] = params[:sort_direction] || :desc
 
       # View types
-      available_view_types = @resource.available_view_types
-      @index_params[:available_view_types] = available_view_types
-
-      @index_params[:view_type] = if params[:view_type].present?
-        params[:view_type]
-      elsif available_view_types.size == 1
-        available_view_types.first
-      else
-        @resource.default_view_type || Avo.configuration.default_view_type
-      end
-
-      if available_view_types.exclude? @index_params[:view_type].to_sym
-        raise "View type '#{@index_params[:view_type]}' is unavailable for #{@resource.class}."
-      end
+      @index_params[:view_type] = params[:view_type] || @resource.default_view_type || Avo.configuration.default_view_type
+      @index_params[:available_view_types] = @resource.available_view_types
     end
 
     def set_filters
@@ -400,9 +392,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.resource_manager.get_resource(params[:via_resource_class])
+        via_resource = Avo::App.resources.get_resource(params[:via_resource_class]).dup
         via_record = via_resource.find_record params[:via_record_id], params: params
-        via_resource = via_resource.new record: via_record
+        via_resource.hydrate 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)
@@ -443,7 +435,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.resource_manager.get_resource_by_model_class(params[:via_relation_class])
+        parent_resource = ::Avo::App.resources.get_resource_by_model_class(params[:via_relation_class]).dup
         association_name = BaseResource.valid_association_name(@record, params[:via_relation])
 
         return resource_view_path(
@@ -536,9 +528,5 @@ module Avo
     def safe_call(method)
       send(method) if respond_to?(method, true)
     end
-
-    def pagy_query
-      @query
-    end
   end
 end

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.resource_manager.all.min_by { |resource| resource.model_key }
+        resource = Avo::App.resources.min_by { |resource| resource.model_key }
         redirect_to resources_path(resource: resource)
       end
     end

data/app/controllers/avo/search_controller.rb

@@ -17,7 +17,7 @@ module Avo
       resources
         .map do |resource|
           # Apply authorization
-          next unless @authorization.set_record(resource.model_class).authorize_action(:search, raise_exception: false)
+          next unless @authorization.set_record(resource.model_class).authorize_action(:index, raise_exception: false)
           # Filter out the models without a search_query
           next if resource.search_query.nil?
 
@@ -37,11 +37,11 @@ module Avo
       query = Avo::ExecutionContext.new(
         target: resource.search_query,
         params: params,
-        query: resource.query_scope
+        scope: resource.class.scope
       ).handle
 
       # Get the count
-      results_count = query.reselect(resource.model_class.primary_key).count
+      results_count = query.reselect(:id).count
 
       # Get the results
       query = query.limit(8)
@@ -58,7 +58,7 @@ module Avo
 
       result_object = {
         header: header,
-        help: resource.fetch_search(:help) || "",
+        help: resource.class.search_query_help,
         results: results,
         count: results.count
       }
@@ -101,36 +101,31 @@ 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])
+      scope = parent.send(association_name)
 
-      # Get association records
-      query = parent.send(association_name)
-
-      # 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
+      Avo::ExecutionContext.new(target: @resource.search_query, params: params, scope: scope).handle
     end
 
     def apply_search_metadata(records, avo_resource)
       records.map do |record|
-        resource = avo_resource.new(record: record)
+        resource = avo_resource.dup.hydrate(record: record).hydrate_fields
 
-        fetch_result_information record, resource, resource.class.fetch_search(:item, record: record)
+        fetch_result_information record, resource
       end
     end
 
     private
 
-    def fetch_result_information(record, resource, item)
+    def fetch_result_information(record, resource)
       {
         _id: record.id,
-        _label: item&.dig(:title) || resource.record_title,
-        _url: resource.class.fetch_search(:result_path, record: resource.record) || resource.record_path
+        _label: resource.label,
+        _url: resource.record_path,
       }
     end
 
     def should_apply_has_many_scope?
-      params[:via_association] == "has_many" && @resource.class.search_query.present?
+      params[:via_association] == "has_many" && @resource.search_query.present?
     end
 
     def should_apply_attach_scope?
@@ -154,15 +149,16 @@ module Avo
     end
 
     def fetch_field
-      fields = Avo.resource_manager.get_resource_by_model_class(params[:via_reflection_class]).new.get_field_definitions
+      fields = ::Avo::App.resources.get_resource_by_model_class(params[:via_reflection_class]).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_resource = Avo.resource_manager.get_resource_by_model_class params[:via_reflection_class]
-      parent_resource.find_record params[:via_reflection_id], params: params
+      parent_class = BaseResource.get_model_by_name params[:via_reflection_class]
+
+      parent_class.find params[:via_reflection_id]
     end
   end
 end

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

@@ -1,13 +1,18 @@
 module Avo
   module InitializesAvo
     def init_app
-      Avo::Current.license = Avo::Licensing::NilLicense.new
+      Avo::Current.license = Avo::Licensing::NullLicense.new
+      Avo::Current.params = request.params
+      Avo::Current.request = request
       Avo::Current.context = context
-      Avo::Current.user = _current_user
+      Avo::Current.current_user = _current_user
       Avo::Current.view_context = view_context
-      Avo.init
+      Avo::Current.app = Avo::App.build request: request, context: context, current_user: _current_user, view_context: view_context
+      Avo::Current.app.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