avo 2.46.0 → 3.0.0.pre1

data/app/components/avo/views/resource_show_component.html.erb

@@ -2,167 +2,24 @@
   data: {
     model_name: @resource.model_name.to_s,
     resource_name: @resource.class.to_s,
-    model_id: @resource.model.id,
+    record_id: @resource.record.id,
     selected_resources_name: @resource.model_key,
-    selected_resources: [@resource.model.id],
+    selected_resources: [@resource.record.id],
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-    <% c.with_tools do %>
-      <% if @resource.has_show_controls? %>
-        <% @resource.render_show_controls.each do |control| %>
-          <% if control.back_button? %>
-            <%= a_link back_path,
-                style: :text,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                },
-                icon: 'arrow-left' do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.delete_button? %>
-            <% if can_see_the_destroy_button? %>
-              <%= a_link helpers.resource_path(model: @resource.model, resource: @resource),
-                style: :text,
-                color: :red,
-                icon: 'trash',
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                title: control.title,
-                data: {
-                  turbo_confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-                  turbo_method: :delete,
-                  control: :destroy,
-                  tippy: control.title ? :tooltip : nil,
-                  'resource-id': @resource.model.id,
-                } do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% elsif can_act_on? && control.actions_list? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, include: control.include, style: control.style, color: control.color, label: control.label %>
-          <% elsif control.edit_button? %>
-            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-              <%= a_link edit_path,
-                  color: :primary,
-                  style: :primary,
-                  title: control.title,
-                  data: {
-                    tippy: control.title ? :tooltip : nil,
-                  },
-                  icon: 'edit' do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% elsif control.action? %>
-            <% if render_action_control?(control.action) %>
-              <%= a_link control.path,
-                  color: control.color,
-                  style: control.style,
-                  icon: control.icon,
-                  title: control.title,
-                  data: {
-                    tippy: control.title ? :tooltip : nil,
-                    'turbo-frame': 'actions_show',
-                    'action': 'click->actions-picker#visitAction',
-                  } do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% elsif control.link_to? %>
-            <%= a_link control.path,
-                color: control.color,
-                style: control.style,
-                icon: control.icon,
-                title: control.title,
-                target: control.target,
-                class: control.class,
-                data: {
-                  **control.data,
-                  tippy: control.title ? :tooltip : nil,
-                } do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.detach_button? %>
-            <% if @reflection.present? && @resource.model.present? && can_detach? %>
-              <%= a_button url: detach_path,
-                icon: 'detach',
-                method: :delete,
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                style: :text,
-                data: {
-                  confirm: "Are you sure you want to detach this #{title}."
-                } do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% else %>
-        <% if @reflection.present? && @resource.model.present? %>
-          <% if can_detach? %>
-            <%= a_button url: detach_path,
-                icon: 'detach',
-                method: :delete,
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                style: :text,
-                data: {
-                  confirm: "Are you sure you want to detach this #{title}."
-                } do %>
-              <%= t('avo.detach_item', item: title).humanize %>
-            <% end %>
-          <% end %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-          <% if can_see_the_edit_button? %>
-            <%= a_link edit_path,
-                color: :primary,
-                style: :primary,
-                icon: 'edit' do %>
-              <%= t('avo.edit').capitalize %>
-            <% end %>
-          <% end %>
-        <% else %>
-          <%= a_link back_path,
-            style: :text,
-            icon: 'arrow-left' do %>
-            <%= t('avo.go_back') %>
-          <% end %>
-          <% if can_see_the_destroy_button? %>
-            <%= a_link destroy_path,
-              style: :text,
-              color: :red,
-              icon: 'trash',
-              form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-              data: {
-                turbo_confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-                turbo_method: :delete,
-                control: :destroy,
-                'resource-id': @resource.model.id,
-              } do %>
-              <%= t('avo.delete').capitalize %>
-            <% end %>
-          <% end %>
-          <% if can_act_on? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-          <% end %>
-          <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-            <%= a_link edit_path,
-              color: :primary,
-              style: :primary,
-              icon: 'edit' do %>
-              <%= t('avo.edit').capitalize %>
-            <% end %>
-          <% end %>
-        <% end %>
+    <% c.tools do %>
+      <% @resource.render_show_controls.each do |control| %>
+        <%= render_control control %>
       <% end %>
     <% end %>
     <% if main_panel.present? %>
-      <% c.with_body do %>
+      <% c.body do %>
         <%# the overflow helps with long values %>
         <div class="divide-y overflow-auto">
           <% main_panel.items.each_with_index do |field, index| %>
             <%= render field
-              .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)
+              .hydrate(resource: @resource, record: @resource.record, user: @resource.user, view: view)
               .component_for_view(view)
               .new(field: field, resource: @resource, index: index, compact: sidebar.present?)
             %>
@@ -171,7 +28,7 @@
       <% end %>
     <% end %>
     <% if sidebar.present? %>
-      <% c.with_sidebar do %>
+      <% c.sidebar do %>
         <%= render sidebar_component %>
       <% end %>
     <% end %>

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
@@ -46,21 +47,22 @@ module Avo
     private
 
     def action_params
-      params.permit(:authenticity_token, :resource_name, :action_id, :button, fields: {})
+      params.permit(:authenticity_token, :resource_name, :action_id, fields: {})
     end
 
     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)
+        view: @view,
         arguments: @resource.get_action_arguments(action_class)
       )
     end
 
     def action_class
       klass_name = params[:action_id].gsub("avo_actions_", "").camelize
+      klass_name = "Avo::Actions::#{klass_name}"
 
       Avo::BaseAction.descendants.find do |action|
         action.to_s == klass_name
@@ -78,18 +80,19 @@ 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
+            path = response[:path]
+
+            if path.respond_to? :call
+              path = instance_eval(&path)
+            end
+
+            redirect_to path
+          elsif response[:type] == :reload
             redirect_back fallback_location: resources_path(resource: @resource)
           end
         end
@@ -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,6 +6,8 @@ module Avo
       Avo::ApplicationController.include Pundit
     end
 
+    include Avo::InitializesAvo
+    include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
     include Avo::Concerns::Breadcrumbs
@@ -15,7 +17,7 @@ module Avo
     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
@@ -126,8 +79,8 @@ module Avo
       @related_resource = related_resource.hydrate(params: params)
     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)
     end
 
     def model_find_scope
@@ -138,12 +91,12 @@ module Avo
       @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
+    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, @model.send(association_name)), params: params
+        @related_resource.find_record params[:related_id], query: eager_load_files(@related_resource, @record.send(association_name)), params: params
       end
     end
 
@@ -151,34 +104,30 @@ module Avo
       @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
-
-      # 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?
+    def set_record_to_fill
+      @record_to_fill = @resource.model_class.new if @view == :create
+      @record_to_fill = @record if @view == :update
     end
 
-    def fill_model
-      # We have to skip filling the the model if this is an attach action
+    def fill_record
+      # We have to skip filling the the record if this is an attach action
       is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
 
       unless is_attach_action
-        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params), extra_params: extra_params)
+        @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
       end
     end
 
     def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
+      @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, model: @related_model)
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, record: @related_record)
     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
@@ -213,11 +162,11 @@ module Avo
     # 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
+      resource = Avo::App.resources.get_resource @resource_name.to_s.camelize.singularize
 
       return resource if resource.present?
 
-      App.get_resource_by_controller_name @resource_name
+      Avo::App.resources.get_resource_by_controller_name @resource_name
     end
 
     def related_resource
@@ -226,23 +175,16 @@ module Avo
 
       return field.use_resource if field&.use_resource.present?
 
-      reflection = @model._reflections[params[:related_name]]
+      reflection = @record._reflections[params[:related_name]]
 
       reflected_model = reflection.klass
 
-      App.get_resource_by_model_name reflected_model
+      Avo::App.resources.get_resource_by_model_class reflected_model
     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
-
-      if attachment_fields.present?
-        attachment_fields.map do |field|
+      if resource.attached_file_fields.present?
+        resource.attached_file_fields.map do |field|
           attachment = case field.class.to_s
           when "Avo::Fields::FileField"
             "attachment"
@@ -263,7 +205,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)
@@ -301,30 +243,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 +278,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 = request.base_url
+        end
+      end
+    rescue => exception
+      Avo.logger.debug "Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
+    end
   end
 end