avo 2.45.0 → 3.0.0.beta1

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

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
-  include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, reflection: nil, parent_resource: nil, parent_model: nil, resource_panel: nil, actions: [])
+  def initialize(resource: nil, reflection: nil, parent_resource: nil, parent_record: nil, resource_panel: nil, actions: [])
     @resource = resource
     @reflection = reflection
     @resource_panel = resource_panel
     @actions = actions
-    @parent_model = parent_model
+    @parent_record = parent_record
     @parent_resource = parent_resource
     @view = :show
   end
@@ -26,7 +25,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
 
   def back_path
     if via_resource?
-      helpers.resource_path(model: association_resource.model_class, resource: association_resource, resource_id: params[:via_resource_id])
+      helpers.resource_path(record: association_resource.model_class, resource: association_resource, resource_id: params[:via_record_id])
     else
       helpers.resources_path(resource: @resource)
     end
@@ -38,20 +37,16 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     if via_resource?
       args = {
         via_resource_class: params[:via_resource_class],
-        via_resource_id: params[:via_resource_id]
+        via_record_id: params[:via_record_id]
       }
     end
 
-    helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
-  end
-
-  def render_action_control?(action)
-    can_act_on? && action.visible_in_view(parent_resource: @parent_resource)
+    helpers.edit_resource_path(record: @resource.record, resource: @resource, **args)
   end
 
   private
 
-  # In development and test environments we shoudl show the invalid field errors
+  # In development and test environments we should show the invalid field errors
   def should_display_invalid_fields_errors?
     (Rails.env.development? || Rails.env.test?) && @resource.invalid_fields.present?
   end

data/app/controllers/avo/actions_controller.rb

@@ -4,9 +4,9 @@ module Avo
   class ActionsController < ApplicationController
     before_action :set_resource_name
     before_action :set_resource
-    before_action :set_model, only: :show, if: ->(request) do
-      # Try to se the model only if the user is on the record page.
-      # set_model will fail if it's tried to be used from the Index page.
+    before_action :set_record, only: :show, if: ->(request) do
+      # Try to se the record only if the user is on the record page.
+      # set_record will fail if it's tried to be used from the Index page.
       request.params[:id].present?
     end
     before_action :set_action, only: [:show, :handle]
@@ -15,7 +15,8 @@ module Avo
       # Se the view to :new so the default value gets prefilled
       @view = :new
 
-      @resource.hydrate(model: @model, view: @view, user: _current_user, params: params)
+      @resource.hydrate(record: @record, view: @view, user: _current_user, params: params)
+      @record = ActionModel.new @action.get_attributes_for_action
     end
 
     def handle
@@ -30,12 +31,10 @@ module Avo
         resource: resource
       }
 
-      unless @action.standalone
-        args[:models] = 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
 
       performed_action = @action.handle_action(**args)
@@ -51,19 +50,17 @@ module Avo
 
     def set_action
       @action = action_class.new(
-        model: @model,
+        record: @record,
         resource: @resource,
         user: _current_user,
         view: :new, # force the action view to in order to render new-related fields (hidden field)
-        arguments: @resource.get_action_arguments(action_class)
+        arguments: decrypted_arguments || {}
       )
     end
 
     def action_class
-      klass_name = params[:action_id].gsub("avo_actions_", "").camelize
-
       Avo::BaseAction.descendants.find do |action|
-        action.to_s == klass_name
+        action.to_s == params[:action_id]
       end
     end
 
@@ -78,18 +75,14 @@ module Avo
       end
 
       respond_to do |format|
-        format.turbo_stream do
+        format.html do
           # Flash the messages collected from the action
           flash_messages messages
 
           if response[:type] == :redirect
-            render turbo_stream: turbo_stream.redirect_to(
-              Avo::ExecutionContext.new(target: response[:path]).handle,
-              nil,
-              response[:redirect_args][:turbo_frame],
-              **response[:redirect_args].except(:turbo_frame)
-            )
-          else
+            redirect_to Avo::ExecutionContext.new(target: response[:path]).handle,
+              **{allow_other_host: response[:allow_other_host], status: response[:status]}.compact
+          elsif response[:type] == :reload
             redirect_back fallback_location: resources_path(resource: @resource)
           end
         end
@@ -119,6 +112,16 @@ module Avo
       )
     end
 
+    def decrypted_arguments
+      arguments = params[:arguments] || params.dig(:fields, :arguments)
+      return if arguments.blank?
+
+      Avo::Services::EncryptionService.decrypt(
+        message: Base64.decode64(arguments),
+        purpose: :action_arguments
+      )
+    end
+
     def flash_messages(messages)
       messages.each do |message|
         flash[message[:type]] = message[:body]
@@ -130,7 +133,7 @@ module Avo
 
       respond_to do |format|
         format.turbo_stream do
-          render partial: "avo/partials/flash_alerts"
+          render "keep_modal_open"
         end
       end
     end

data/app/controllers/avo/application_controller.rb

@@ -6,16 +6,18 @@ module Avo
       Avo::ApplicationController.include Pundit
     end
 
+    include Avo::InitializesAvo
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
     include Avo::Concerns::Breadcrumbs
+    include Pagy::Backend
 
     protect_from_forgery with: :exception
     around_action :set_avo_locale
     around_action :set_force_locale, if: -> { params[:force_locale].present? }
     before_action :set_default_locale, if: -> { params[:set_locale].present? }
     before_action :init_app
-    before_action :check_avo_license
+    before_action :set_active_storage_current_host
     before_action :set_resource_name
     before_action :_authenticate!
     before_action :set_authorization
@@ -27,15 +29,9 @@ module Avo
     rescue_from Avo::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path, :preview_resource_path
     add_flash_types :info, :warning, :success, :error
 
-    def init_app
-      Avo::App.init request: request, context: context, current_user: _current_user, view_context: view_context, params: params
-
-      @license = Avo::App.license
-    end
-
     def exception_logger(exception)
       respond_to do |format|
         format.html { raise exception }
@@ -49,49 +45,6 @@ module Avo
       end
     end
 
-    def render(*args)
-      raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:check_avo_license).source_location.first.match?(/.*\/app\/controllers\/avo\/application_controller\.rb/)
-
-      if params[:controller] == "avo/search" && params[:action] == "index"
-        raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:index).source_location.first.match?(/.*\/app\/controllers\/avo\/search_controller\.rb/)
-      end
-
-      if params[:controller] == "avo/dashboards" && params[:action] == "show"
-        raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:show).source_location.first.match?(/.*\/app\/controllers\/avo\/dashboards_controller\.rb/)
-      end
-
-      if params[:controller] == "avo/dashboards" && params[:action] == "card"
-        raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:card).source_location.first.match?(/.*\/app\/controllers\/avo\/dashboards_controller\.rb/)
-      end
-
-      super(*args)
-    end
-
-    def check_avo_license
-      # Check to see if the path is a custom tool
-      if on_custom_tool_page
-        if @license.lacks(:custom_tools) || @license.invalid?
-          message = "Your license is invalid or doesn't support custom tools."
-        end
-      end
-
-      # Check to see if the path is a dashboard
-      if on_dashboards_path
-        if @license.lacks(:dashboards) || @license.invalid?
-          message = "Your license is invalid or doesn't support dashboards."
-        end
-      end
-
-      if message.present?
-        if Rails.env.development? || Rails.env.test?
-          @custom_tools_alert_visible = message
-        elsif @license.lacks_with_trial(:custom_tools)
-          # Raise error in non-development environments.
-          raise Avo::LicenseInvalidError, message
-        end
-      end
-    end
-
     def _current_user
       instance_eval(&Avo.configuration.current_user)
     end
@@ -108,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
@@ -119,15 +115,28 @@ 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_model
-      @model = @resource.find_record(params[:id], query: model_find_scope, params: params)
+    def set_record
+      @record = @resource.find_record(params[:id], query: model_find_scope, params: params)
+      @resource.hydrate(record: @record)
+    end
+
+    def set_related_record
+      association_name = BaseResource.valid_association_name(@record, params[:related_name])
+      @related_record = if @field.is_a? Avo::Fields::HasOneField
+        @record.send association_name
+      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
@@ -135,50 +144,49 @@ module Avo
     end
 
     def model_scope
+      # abort @resource.inspect
       @resource.class.find_scope
     end
 
-    def set_related_model
-      association_name = BaseResource.valid_association_name(@model, params[:related_name])
-      @related_model = if @field.is_a? Avo::Fields::HasOneField
-        @model.send association_name
-      else
-        @related_resource.find_record params[:related_id], query: eager_load_files(@related_resource, @model.send(association_name)), params: params
-      end
-    end
-
     def set_view
       @view = action_name.to_sym
     end
 
-    def set_model_to_fill
-      @model_to_fill = @resource.model_class.new if @view == :create
-      @model_to_fill = @model if @view == :update
+    def set_record_to_fill
+      @record_to_fill = @resource.model_class.new if @view == :create
+      @record_to_fill = @record if @view == :update
 
-      # If resource.model is nil, most likely the user is creating a new record.
-      # In that case, to access resource.model in visible and readonly blocks we hydrate the resource with a new model.
-      @resource.hydrate(model: @model_to_fill) if @resource.model.nil?
+      # 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_model
-      # We have to skip filling the the model if this is an attach action
-      is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
+    def fill_record
+      # We have to skip filling the the record if this is an attach action
+      return if is_attach_action?
 
-      unless is_attach_action
-        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params), extra_params: extra_params)
-      end
+      @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
+      assign_default_value_to_disabled_fields if @view == :create
     end
 
-    def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
+    def is_attach_action?
+      params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
     end
 
-    def hydrate_related_resource
-      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @related_model)
+    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
     end
 
     def authorize_base_action
-      class_to_authorize = @model || @resource.model_class
+      class_to_authorize = @record || @resource.model_class
 
       authorize_action class_to_authorize
     end
@@ -190,49 +198,6 @@ 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 = App.get_resource @resource_name.to_s.camelize.singularize
-
-      return resource if resource.present?
-
-      App.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 = @model._reflections[params[:related_name]]
-
-      reflected_model = reflection.klass
-
-      App.get_resource_by_model_name reflected_model
-    end
-
     def eager_load_files(resource, query)
       # Get the non-computed file fields and try to eager load them
       attachment_fields = resource
@@ -263,7 +228,7 @@ module Avo
       instance_eval(&Avo.configuration.authenticate)
     end
 
-    def render_unauthorized(_exception)
+    def render_unauthorized(exception)
       flash[:notice] = t "avo.not_authorized"
 
       redirect_url = if request.referrer.blank? || (request.referrer == request.url)
@@ -278,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
@@ -301,30 +266,6 @@ module Avo
       instance_eval(&Avo.configuration.initial_breadcrumbs) if Avo.configuration.initial_breadcrumbs.present?
     end
 
-    def on_root_path
-      [Avo.configuration.root_path, "#{Avo.configuration.root_path}/"].include?(request.original_fullpath)
-    end
-
-    def on_resources_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/resources\/.*/)
-    end
-
-    def on_api_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/avo_api\/.*/)
-    end
-
-    def on_dashboards_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/dashboards\/.*/)
-    end
-
-    def on_debug_path
-      request.original_url.match?(/.*#{Avo.configuration.root_path}\/avo_private\/debug.*/)
-    end
-
-    def on_custom_tool_page
-      !(on_root_path || on_resources_path || on_api_path || on_dashboards_path || on_debug_path)
-    end
-
     def model_param_key
       @resource.form_scope
     end
@@ -360,5 +301,18 @@ module Avo
       value = cookies["#{Avo::COOKIES_KEY}.sidebar.open"]
       @sidebar_open = value.blank? || value == "1"
     end
+
+    # Set the current host for ActiveStorage
+    def set_active_storage_current_host
+      if defined?(ActiveStorage::Current)
+        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}
+        end
+      end
+    rescue => exception
+      Avo.logger.debug "Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
+    end
   end
 end