avo 3.30.4 → 4.0.0.beta.2

data/app/controllers/avo/base_controller.rb

@@ -11,19 +11,24 @@ module Avo
     before_action :set_record_to_fill, only: [:new, :edit, :create, :update]
     before_action :detect_fields
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
-    before_action :fill_record, only: [:create, :update]
+    before_action :fill_record, if: -> { action_name.in?(["create", "update"]) || params["react_on"].present? }
     # Don't run base authorizations for associations
-    before_action :authorize_base_action, except: :preview, if: -> { controller_name != "associations" }
+    before_action :authorize_base_action, except: [:preview, :search], if: -> { controller_name != "associations" }
     before_action :set_pagy_locale, only: :index
 
+    before_action :set_modal_params
+    layout :choose_layout
+
     def index
       @page_title = @resource.plural_name.humanize
 
       if @reflection.present? && !turbo_frame_request?
-        add_breadcrumb @record.class.to_s.pluralize, resources_path(resource: @parent_resource)
-        add_breadcrumb @parent_resource.record_title, resource_path(record: @record, resource: @parent_resource)
+        # A good rule of thumb is that the resource name entry (Users) gets just the initials
+        # The record name gets initials and avatar
+        add_breadcrumb title: @record.class.to_s.pluralize, path: resources_path(resource: @parent_resource), initials: @parent_resource.class.initials
+        add_breadcrumb title: @parent_resource.record_title, path: resource_path(record: @record, resource: @parent_resource), initials: @parent_resource.initials, avatar: @parent_resource.avatar
       end
-      add_breadcrumb @resource.plural_name.humanize
+      add_breadcrumb title: @resource.plural_name.humanize, initials: @resource.class.initials
 
       set_applied_filters
       set_index_params
@@ -36,6 +41,9 @@ module Avo
         @query = @query.includes(*@resource.includes)
       end
 
+      # Apply the search query if configured on the resource
+      apply_search
+
       # Eager load attachments
       if @resource.attachments.present?
         @resource.attachments.each do |attachment|
@@ -64,6 +72,36 @@ module Avo
       end
 
       set_component_for __method__
+
+      if request.headers["X-Search-Request"] == "resource-search-controller"
+        respond_to do |format|
+          format.turbo_stream do
+            has_resources = @resources.present?
+            common_args = {
+              resources: @resources,
+              resource: @resource,
+              reflection: @reflection,
+              parent_record: @parent_record,
+              parent_resource: @parent_resource,
+              pagy: @pagy,
+              query: @query,
+              actions: @actions
+            }
+
+            render turbo_stream: [
+              turbo_stream.replace("#{@resource.model_key}_body_content") do
+                Avo::Current.view_context.render Avo::ResourceListingComponent.new(
+                  **common_args,
+                  turbo_frame: @turbo_frame,
+                  index_params: @index_params
+                )
+              end,
+              # used to show/hide the filters button and bar
+              has_resources ? turbo_stream.remove_css_class("body", "index-missing-resources") : turbo_stream.add_css_class("body", "index-missing-resources")
+            ]
+          end
+        end
+      end
     end
 
     def show
@@ -84,16 +122,17 @@ module Avo
         via_record = via_resource.find_record params[:via_record_id], params: params
         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)
+        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: via_resource), initials: via_resource.class.initials
+        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials
 
-        add_breadcrumb @resource.plural_name.humanize
+        # The path is nil because it's not easy to compute the association link (course->course_links = /links)
+        add_breadcrumb title: @resource.plural_name.humanize, path: nil, initials: @resource.class.initials
       else
-        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+        add_breadcrumb title: @resource.plural_name.humanize, path: resources_path(resource: @resource), initials: @resource.class.initials
       end
 
-      add_breadcrumb @resource.record_title
-      add_breadcrumb I18n.t("avo.details").upcase_first
+      add_breadcrumb title: @resource.record_title, path: nil, avatar: @resource.avatar, initials: @resource.initials
+      add_breadcrumb title: I18n.t("avo.details").upcase_first, path: nil
 
       set_component_for __method__
     end
@@ -103,11 +142,6 @@ module Avo
       @record = @resource.record
       @resource.hydrate(view: Avo::ViewInquirer.new(:new), user: _current_user)
 
-      # Handle special cases when creating a new record via a belongs_to relationship
-      if params[:via_belongs_to_resource_class].present?
-        return render turbo_stream: turbo_stream.append(Avo::MODAL_FRAME_ID, partial: "avo/base/new_via_belongs_to")
-      end
-
       set_actions
 
       @page_title = @resource.default_panel_name.to_s
@@ -117,17 +151,20 @@ module Avo
         via_record = via_resource.find_record params[:via_record_id], params: params
         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)
+        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: via_resource), initials: via_resource.class.initials
+        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials
 
-        add_breadcrumb @resource.plural_name.humanize
+        add_breadcrumb title: @resource.plural_name.humanize, initials: @resource.class.initials
       else
-        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+        add_breadcrumb title: @resource.plural_name.humanize, path: resources_path(resource: @resource), initials: @resource.class.initials
       end
 
-      add_breadcrumb t("avo.new").humanize
+      add_breadcrumb title: t("avo.new").humanize
 
       set_component_for __method__, fallback_view: :edit
+
+      # Called from avo-advanced
+      safe_call :handle_reactive_fields
     end
 
     def create
@@ -165,8 +202,8 @@ module Avo
       saved = save_record
       @resource.hydrate(record: @record, view: Avo::ViewInquirer.new(:new), user: _current_user)
 
-      add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
-      add_breadcrumb t("avo.new").humanize
+      add_breadcrumb title: @resource.plural_name.humanize, path: resources_path(resource: @resource), initials: @resource.class.initials
+      add_breadcrumb title: t("avo.new").humanize, path: nil, avatar: @resource.avatar, initials: @resource.initials
       set_actions
 
       set_component_for :edit
@@ -182,6 +219,9 @@ module Avo
       set_actions
 
       set_component_for __method__
+
+      # Called from avo-advanced
+      safe_call :handle_reactive_fields
     end
 
     def update
@@ -219,8 +259,25 @@ module Avo
       render layout: params[:turbo_frame].blank?
     end
 
+    def search
+      # Do not remove this method, it is implemented on avo-pro
+      # Just a placeholder to avoid:
+      # The search action could not be found for the :authorize_base_action
+      # callback on Avo::UsersController, but it is listed in the controller's
+      # :except option.
+      # Raising for missing callback actions is a new default in Rails 7.1, if you'd
+      # like to turn this off you can delete the option from the environment configurations
+      # or set `config.action_controller.raise_on_missing_callback_actions` to `false`.
+    end
+
     private
 
+    def unprocessable_status
+      # :unprocessable_content was added in Rails 7.1
+      # Use it when available, fall back to :unprocessable_entity for older versions
+      (Rails.version.to_f >= 7.1) ? :unprocessable_content : :unprocessable_entity
+    end
+
     def save_record
       perform_action_and_record_errors do
         save_record_action
@@ -324,17 +381,18 @@ module Avo
       @index_params = {}
 
       set_pagination_params
-
-      # Sorting
-      @index_params[:sort_by] = params[:sort_by] || @resource.sort_by_param
-
-      @index_params[:sort_direction] = params[:sort_direction] || @resource.default_sort_direction
+      set_sorting_params
 
       if @resource.available_view_types.exclude? @resource.view_type.to_sym
         raise "View type '#{@resource.view_type}' is unavailable for #{@resource.class}."
       end
     end
 
+    def set_sorting_params
+      @index_params[:sort_by] = params[:sort_by] || @resource.sort_by_param
+      @index_params[:sort_direction] = params[:sort_direction] || @resource.default_sort_direction
+    end
+
     def set_filters
       @filters = @resource
         .get_filters
@@ -415,24 +473,39 @@ module Avo
         via_record = via_resource.find_record params[:via_record_id], params: params
         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)
+        add_breadcrumb title: via_resource.plural_name, path: resources_path(resource: @resource), initials: via_resource.class.initials
+        add_breadcrumb title: via_resource.record_title, path: resource_path(record: via_record, resource: via_resource), avatar: via_resource.avatar, initials: via_resource.initials
 
         last_crumb_args = {
           via_resource_class: params[:via_resource_class],
           via_record_id: params[:via_record_id]
         }
-        add_breadcrumb @resource.plural_name.humanize
+        add_breadcrumb title: @resource.plural_name.humanize, initials: @resource.class.initials
       else
-        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+        add_breadcrumb title: @resource.plural_name.humanize, path: resources_path(resource: @resource), initials: @resource.class.initials
       end
 
-      add_breadcrumb @resource.record_title, resource_path(record: @resource.record, resource: @resource, **last_crumb_args)
-      add_breadcrumb t("avo.edit").humanize
+      add_breadcrumb title: @resource.record_title, path: resource_path(record: @resource.record, resource: @resource, **last_crumb_args), avatar: @resource.avatar, initials: @resource.initials
+      add_breadcrumb title: t("avo.edit").humanize
     end
 
     def create_success_action
-      return render "close_modal_and_reload_field" if params[:via_belongs_to_resource_class].present?
+      if params[:via_belongs_to_resource_class].present?
+        respond_to do |format|
+          format.turbo_stream do
+            render turbo_stream: [
+              turbo_stream.remove(Avo::MODAL_FRAME_ID),
+              turbo_stream.avo_update_belongs_to(
+                relation_name: params[:via_relation],
+                target_record_id: @record.to_param,
+                target_resource_label: @resource.record_title,
+                target_resource_class: @record.class.name
+              )
+            ]
+          end
+        end
+        return
+      end
 
       respond_to do |format|
         format.html { redirect_to after_create_path, notice: create_success_message }
@@ -443,7 +516,7 @@ module Avo
       flash.now[:error] = create_fail_message
 
       respond_to do |format|
-        format.html { render :new, status: :unprocessable_entity }
+        format.html { render :new, status: unprocessable_status }
         format.turbo_stream { render "create_fail_action" }
       end
     end
@@ -481,7 +554,7 @@ module Avo
       flash.now[:error] = update_fail_message
 
       respond_to do |format|
-        format.html { render :edit, status: :unprocessable_entity }
+        format.html { render :edit, status: unprocessable_status }
         format.turbo_stream { render "update_fail_action" }
       end
     end
@@ -546,9 +619,7 @@ module Avo
       return nil if @resource.class.send(action).blank?
 
       extra_args = {}
-      if params[:return_to].present?
-        extra_args[:return_to] = e(params[:return_to])
-      end
+      extra_args[:return_to] = params[:return_to] if params[:return_to].present?
 
       if @resource.class.send(action) == :index
         resources_path(resource: @resource, **extra_args)
@@ -566,6 +637,7 @@ module Avo
     # Set pagy locale from params or from avo configuration, if both nil locale = "en"
     def set_pagy_locale
       @pagy_locale = locale.to_s || Avo.configuration.default_locale || "en"
+      Pagy::I18n.locale = @pagy_locale if defined?(Pagy::I18n) && Pagy::I18n.respond_to?(:locale=)
     end
 
     def pagy_query
@@ -645,5 +717,32 @@ module Avo
     def set_query
       @query ||= @resource.class.query_scope
     end
+
+    def apply_search
+      return if @resource.class.search_query.nil? || params[:q].nil?
+
+      @query = Avo::ExecutionContext.new(
+        target: @resource.class.search_query,
+        params: params,
+        q: params[:q].strip,
+        query: @query
+      ).handle
+    end
+
+    def choose_layout
+      if params[:modal_layout].present?
+        "avo/modal"
+      else
+        "avo/application"
+      end
+    end
+
+    def set_modal_params
+      return unless params[:modal_layout].present?
+
+      @modal_width = params[:modal_width] || "4xl"
+      @modal_height = params[:modal_height] || "4xl"
+      @wrapper_class = params[:wrapper_class] || ""
+    end
   end
 end

data/app/controllers/avo/debug_controller.rb

@@ -10,34 +10,5 @@ module Avo
         format.text { render :status }
       end
     end
-
-    def send_to_hq
-      url = "#{ENV["HQ_URL"]}/api/v3/debug_requests"
-      timeout = 10 # seconds
-      license_key = Avo::Services::DebugService.debug_report(request)[:hq_payload][:license_key]
-      body = params[:body]
-      body = {license_key: license_key, body: body, payload: Avo::Services::DebugService.debug_report(request).to_json}.to_json
-
-      Avo::Licensing::Request.post(url, body:, timeout:)
-
-      render turbo_stream: turbo_stream.replace(:send_to_hq, plain: "Payload sent to Avo HQ.")
-    end
-
-    def report
-    end
-
-    def refresh_license
-      license = Licensing::LicenseManager.refresh_license request
-
-      if license.valid?
-        flash[:notice] = "avohq.io responded: \"#{license.id.humanize} license is valid\"."
-      elsif license.response["reason"].present?
-        flash[:error] = "avohq.io responded: \"#{license.response["reason"]}\"."
-      else
-        flash[:error] = license.response["error"]
-      end
-
-      redirect_back fallback_location: avo.avo_private_status_path
-    end
   end
 end

data/app/controllers/avo/media_library_controller.rb

@@ -1,14 +1,30 @@
 module Avo
   class MediaLibraryController < ApplicationController
-    include Pagy::Backend
+    include Pagy::Method
     before_action :authorize_access!
+    before_action -> { @container_size = "large" }, only: [:show]
 
     def index
       @attaching = false
+      add_breadcrumb title: "Media Library", initials: "ML"
     end
 
     def show
       @blob = ActiveStorage::Blob.find(params[:id])
+
+      add_breadcrumb title: "Media Library", path: avo.media_library_index_path, initials: "ML"
+      add_breadcrumb title: @blob.filename.to_s, path: nil, initials: extract_initials(@blob.filename.to_s)
+    end
+
+    def extract_initials(filename)
+      # Remove file extension
+      name_without_ext = File.basename(filename, File.extname(filename))
+
+      # Split by spaces and take first 2 words
+      words = name_without_ext.split(" ").first(2)
+
+      # Extract first character of each word and join
+      words.map { |word| word[0] }.join("").upcase
     end
 
     def destroy

data/app/controllers/avo/search_controller.rb

@@ -1,3 +1,8 @@
+# Only used for searchable fields
+
+# This controller is currently only used for searchable fields, it keeps the old search controller without any changes
+# Possibly have much more logic that it uses, but it's not worth the effort to refactor it since we're going to replace it with a new searchable fields way
+
 require_dependency "avo/application_controller"
 
 module Avo

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

@@ -1,19 +1,18 @@
 module Avo
   module InitializesAvo
+    include Avo::Concerns::SafeCall
+
     def init_app
-      Avo::Current.license = Avo::Licensing::NilLicense.new
       Avo::Current.context = context
       Avo::Current.user = _current_user
       Avo::Current.view_context = view_context
+      safe_call(:before_init_app)
       Avo.init
-      Avo::Current.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
-
-      # Output a warning in the logs if the license is invalid
-      if Avo::Current.license.invalid?
-        Avo.logger.debug "Your Avo license looks invalid. Please troubleshoot it using the directions here: https://docs.avohq.io/3.0/license-troubleshooting.html"
-      end
-
       Avo::Current.locale = locale
+
+      # Fire and forget HQ reporting
+      request_info = {ip: request.ip, host: request.host, port: request.port}
+      Thread.new { Avo::Services::HqReporter.report(request_info) }
     end
 
     def _current_user

data/app/helpers/avo/application_helper.rb

@@ -1,8 +1,9 @@
 module Avo
   module ApplicationHelper
-    include ::Pagy::Frontend
     include Avo::ResourcesHelper
 
+    def ui = Avo::UIInstance
+
     def render_license_warning(title: "", message: "", icon: "exclamation")
       render partial: "avo/sidebar/license_warning", locals: {
         title: title,
@@ -28,7 +29,7 @@ module Avo
     end
 
     def button_classes(extra_classes = nil, color: nil, variant: nil, size: :md, active: false)
-      classes = "inline-flex flex-grow-0 items-center text-sm font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 rounded transform transition duration-100 active:translate-x-px active:translate-y-px cursor-pointer disabled:cursor-not-allowed #{extra_classes}"
+      classes = "inline-flex grow-0 items-center text-sm font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 rounded-sm transform transition duration-100 active:translate-x-px active:translate-y-px cursor-pointer disabled:cursor-not-allowed #{extra_classes}"
 
       if color.present?
         if variant.present? && (variant.to_sym == :outlined)
@@ -59,26 +60,12 @@ module Avo
       classes
     end
 
-    def input_classes(extra_classes = "", has_error: false)
-      classes = "appearance-none inline-flex bg-gray-25 disabled:cursor-not-allowed text-gray-600 disabled:opacity-50 rounded py-2 px-3 leading-tight border focus:border-gray-600 focus-visible:ring-0 focus:text-gray-700 placeholder:text-gray-300"
-
-      classes += if has_error
-        " border-red-600"
-      else
-        " border-gray-200"
-      end
-
+    def input_classes(extra_classes = "", has_error: false, size: :md)
+      classes = ""
+      classes += "input--size-#{size}" if [:sm, :md, :lg].include?(size)
+      classes += " input-field--error" if has_error
       classes += " #{extra_classes}"
-
-      classes
-    end
-
-    def white_panel_classes
-      "bg-white rounded shadow-md"
-    end
-
-    def card_classes
-      "bg-white rounded shadow-panel"
+      classes.strip
     end
 
     def get_model_class(model)
@@ -134,47 +121,76 @@ module Avo
       defined?(Authentication) && Authentication.private_instance_methods.include?(:require_authentication) && Authentication.private_instance_methods.include?(:authenticated?)
     end
 
-    def pagy_major_version
-      return nil unless defined?(Pagy::VERSION)
-      version = Pagy::VERSION&.split(".")&.first&.to_i
+    def body_classes
+      os_class = request.user_agent.to_s.include?("Mac") ? "os-mac" : "os-pc"
 
-      return "8-or-more" if version >= 8
+      view_class = if controller.class.superclass.to_s == "Avo::ResourcesController"
+        case action_name.to_sym
+        when :index
+          "resource-index-view"
+        when :show
+          "resource-show-view"
+        when :edit, :update
+          "resource-edit-view"
+        when :new, :create
+          "resource-new-view"
+        end
+      end
 
-      version
+      [os_class, view_class, *Array.wrap(Avo.configuration.body_classes)]
     end
 
-    def container_is_full_width?
-      if @container_full_width.present?
-        @container_full_width
-      elsif Avo.configuration.full_width_container
-        true
-      elsif Avo.configuration.full_width_index_view && action_name.to_sym == :index && controller.class.superclass.to_s == "Avo::ResourcesController"
-        true
-      else
-        false
-      end
+    # Check if the current locale is RTL (Right-to-Left)
+    def rtl?
+      Avo.configuration.rtl?
+    end
+
+    # Returns "rtl" or "ltr" based on current locale
+    def text_direction
+      Avo.configuration.text_direction
     end
 
     def container_classes
-      container_is_full_width? ? "" : "2xl:container 2xl:mx-auto"
+      return "container-#{container_width_css_suffix(@container_size.to_sym)}" if @container_size.present?
+
+      width = Avo.configuration.container_width.fetch(@view&.to_sym, :large)
+      "container-#{container_width_css_suffix(width)}"
     end
 
     # encode & encrypt params
     def e(value)
-      encrypted = Avo::Services::EncryptionService.encrypt(message: value, purpose: :return_to, serializer: Marshal)
-      Base64.urlsafe_encode64(encrypted, padding: false)
+      Avo::Services::EncryptionService.encrypt(message: value, purpose: :return_to, serializer: Marshal)
     end
 
     # decrypt & decode params
     def d(value)
-      decoded = Base64.urlsafe_decode64(value.to_s)
-      Avo::Services::EncryptionService.decrypt(message: decoded, purpose: :return_to, serializer: Marshal)
+      Avo::Services::EncryptionService.decrypt(message: value, purpose: :return_to, serializer: Marshal)
     rescue
-      nil
+      value
+    end
+
+    def wrap_in_modal(content)
+      turbo_frame_tag Avo::MODAL_FRAME_ID do
+        render(Avo::ModalComponent.new(width: :xl, body_class: "bg-application")) do |c|
+          content
+        end
+      end
+    end
+
+    def editor_file_path(path)
+      editor_url(Object.const_source_location(path.class.to_s)&.first)
+    end
+
+    def editor_url(path)
+      Avo.configuration.default_editor_url.gsub("%{path}", path)
     end
 
     private
 
+    def container_width_css_suffix(width)
+      (width == :full) ? "full-width" : width.to_s
+    end
+
     def avo_field(type = nil, id = nil, as: nil, view: :show, form: nil, component_options: {}, **args, &block)
       if as.present?
         id = type
@@ -197,10 +213,8 @@ module Avo
       avo_field(id, type, **args, view: view, &block)
     end
 
-    def field_container(**args, &block)
-      classes = args[:class] || ""
-      classes << "flex flex-col divide-y"
-      content_tag :div, **args, class: classes, &block
+    def accent_colors
+      %w[red orange amber yellow lime green emerald teal cyan sky blue indigo violet purple fuchsia pink rose]
     end
   end
 end

data/app/helpers/avo/turbo_stream_actions_helper.rb

@@ -19,6 +19,15 @@ module Avo
     def avo_turbo_reload
       turbo_stream_action_tag :turbo_reload
     end
+
+    def avo_update_belongs_to(relation_name:, target_record_id:, target_resource_label:, target_resource_class:)
+      turbo_stream_action_tag "update-belongs-to",
+        data: {
+          relation_name: relation_name,
+          target_record_id: target_record_id,
+          target_resource_label: target_resource_label,
+          target_resource_class: target_resource_class
+        }
+    end
   end
 end
-

data/app/helpers/avo/url_helpers.rb

@@ -52,9 +52,10 @@ module Avo
       model_name, # teams
       record_id, # 1
       related_name, # admin
-      related_id = nil
+      related_id = nil,
+      **args
     )
-      avo.resources_associations_destroy_path(model_name, record_id, related_name, related_id)
+      avo.resources_associations_destroy_path(model_name, record_id, related_name, related_id, **args)
     end
 
     def related_resources_path(