avo 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd7ab9c0d5e4743874638117c67d87e723a4300ef8342be0c3ef868ce0a07e2
-  data.tar.gz: 8229f364c7341342e7ac25a8da2be3fc15d10a1feeeb7c5f8c2a6fc270c4cde6
+  metadata.gz: 371a5db5091d8aad3fd0109c8640a06b10ee5cb61d9b16c5a98d25e566b54787
+  data.tar.gz: 8c15d927349aed0e15ccda76f656883e51ca8c3d33ba703c2646ff7a59695a1a
 SHA512:
-  metadata.gz: cd6e21cbe3c211a4fa669970b9de4ead47566712fc6dadbcbce0c08e2d1cbf21cdd73e63e05677cc53cff591fb7420651aa8f8048f2329a760de8458addf2ed0
-  data.tar.gz: 98c83f4ea0c66bdb5016c650c1f29fd14f0a98f45a4bd024f5d0285d34bbb8a296d3cce94457443e95f6cff4293cac11155ce13339c6c9d5c630af9119669aaa
+  metadata.gz: ab631914363eb8bd77a5f1053d9c568d6e36f2cdd8c05a84845e4726e3d069394afc1be9778dcc3ad051a91839cb1ef050b12711e165cf8140014cb844096c8c
+  data.tar.gz: 8cbbe3db1bd3e0b77b548706eb696f0ee0bb455cdb2d5ccab6047e4747a0eeae9eff167456bd214ab392825b6c356d061be07c15c7732ef213bc4fa64753c3df

data/Gemfile

@@ -39,7 +39,7 @@ gem "puma", "~> 5.6.2"
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use Active Storage variant
-gem "image_processing", "~> 1.2"
+gem "image_processing", "~> 1.12"
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", require: false

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    avo (1.24.0)
+    avo (1.25.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
       countries
+      dry-initializer
       hotwire-rails
       httparty
       image_processing
@@ -155,6 +156,7 @@ GEM
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
+    dry-initializer (3.1.1)
     erubi (1.10.0)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
@@ -185,7 +187,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
-    image_processing (1.12.1)
+    image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-wait (0.2.1)
@@ -368,7 +370,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    view_component (2.48.0)
+    view_component (2.49.1)
       activesupport (>= 5.0.0, < 8.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -423,7 +425,7 @@ DEPENDENCIES
   hotwire-rails
   htmlbeautifier
   httparty
-  image_processing (~> 1.2)
+  image_processing (~> 1.12)
   iso
   jsbundling-rails
   launchy

data/app/components/avo/base_component.rb

@@ -4,4 +4,32 @@ class Avo::BaseComponent < ViewComponent::Base
   def has_with_trial(ability)
     ::Avo::App.license.has_with_trial(ability)
   end
+
+  private
+
+  # Figure out what is the corresponding field for this @reflection
+  def field
+    fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
+    fields.find { |f| f.id == @reflection.name }
+  rescue
+    nil
+  end
+
+  def relation_resource
+    ::Avo::App.get_resource_by_model_name params[:via_resource_class].safe_constantize
+  end
+
+  # Get the resource for the resource using the klass attribute so we get the namespace too
+  def reflection_resource
+    ::Avo::App.get_resource_by_model_name(@reflection.klass.to_s)
+  rescue
+    nil
+  end
+
+  # Get the resource for the resource using the klass attribute so we get the namespace too
+  def reflection_parent_resource
+    ::Avo::App.get_resource_by_model_name(@reflection.active_record.to_s)
+  rescue
+    nil
+  end
 end

data/app/components/avo/fields/belongs_to_field/autocomplete_component.html.erb

@@ -6,7 +6,7 @@
     data-via-association="belongs_to"
   ></div>
   <div class="relative w-full" autocomplete="off">
-    <%= @form.text_field @field.foreign_key,
+    <%= @form.text_field @foreign_key,
       value: field_label,
       class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
       placeholder: @field.placeholder,

data/app/components/avo/fields/belongs_to_field/autocomplete_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
-  def initialize(form:, field:, model_key:, foreign_key:, disabled:, type: nil, resource: nil, polymorphic_record: nil)
+  def initialize(form:, field:, model_key:, foreign_key:, disabled: false, type: nil, resource: nil, polymorphic_record: nil)
     @form = form
     @field = field
     @type = type
@@ -37,7 +37,15 @@ class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
   private
 
   def should_prefill?
-    @field.is_polymorphic? && searchable? && !(new_record? && has_polymorphic_association?)
+    # default this conditional to true
+    is_polymorphic = true
+
+    # if this is a field that can be polymorphic (belongs_to)
+    if @field.respond_to? :is_polymorphic?
+      is_polymorphic = @field.is_polymorphic?
+    end
+
+    is_polymorphic && searchable? && !(new_record? && has_polymorphic_association?)
   end
 
   def searchable?

data/app/components/avo/index/ordering/base_component.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Avo::Index::Ordering::BaseComponent < ViewComponent::Base
+class Avo::Index::Ordering::BaseComponent < Avo::BaseComponent
   private
 
   def order_actions

data/app/components/avo/index/ordering/button_component.html.erb

@@ -4,6 +4,7 @@
   class: 'flex items-center',
   data: {
     target: "order:#{direction}",
+    'turbo-frame': params[:turbo_frame],
     'tippy': 'tooltip',
   } do %>
   <%= helpers.svg(svg, class: 'text-gray-400 h-6 hover:text-gray-600') %>

data/app/components/avo/index/ordering/button_component.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 class Avo::Index::Ordering::ButtonComponent < Avo::Index::Ordering::BaseComponent
-  attr_reader :resource
-  attr_reader :direction
-  attr_reader :svg
+  attr_accessor :resource
+  attr_accessor :reflection
+  attr_accessor :direction
+  attr_accessor :svg
 
-  def initialize(resource: nil, direction: nil, svg: nil)
+  def initialize(resource:, direction:, svg: nil,  reflection: nil)
     @resource = resource
+    @reflection = reflection
     @direction = direction
     @svg = svg
   end
@@ -16,7 +18,11 @@ class Avo::Index::Ordering::ButtonComponent < Avo::Index::Ordering::BaseComponen
   end
 
   def order_path(args)
-    path = "#{::Avo::App.root_path}/resources/#{resource.route_key}/#{resource.model.id}/order"
+    if reflection.present?
+      path = "#{::Avo::App.root_path}/resources/#{reflection_parent_resource.route_key}/#{params[:id]}/#{field.id}/#{resource.model.id}/order"
+    else
+      path = "#{::Avo::App.root_path}/resources/#{resource.route_key}/#{resource.model.id}/order"
+    end
 
     if args.present?
       string_args = args.map do |key, value|

data/app/components/avo/index/ordering/buttons_component.html.erb

@@ -1,5 +1,12 @@
 <div class="flex items-center justify-center">
-  <% unless always_visible? %>
+  <% if display_inline? %>
+    <div class="flex max-w-xs rounded">
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :higher, svg: 'arrow-up' %>
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :lower, svg: 'arrow-down' %>
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :to_top, svg: 'download-solid-reversed' %>
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :to_bottom, svg: 'download-solid' %>
+    </div>
+  <% else %>
     <div class="popover inline-block"
       data-controller="popover"
       data-popover-translate-x="-100%"
@@ -15,16 +22,11 @@
       %>
       <%= helpers.svg('switch-vertical', class: 'text-gray-400 h-6 hover:text-gray-600') %>
     <% end %>
-  <% end %>
-  <% if always_visible? %>
-    <div class="flex max-w-xs rounded">
-    <% else %>
-      <div class="flex hidden absolute max-w-xs bg-white rounded p-2 z-40" data-popover-target="content">
-    <% end %>
-    <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, direction: :higher, svg: 'arrow-up' %>
-    <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, direction: :lower, svg: 'arrow-down' %>
-    <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, direction: :to_top, svg: 'download-solid-reversed' %>
-    <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, direction: :to_bottom, svg: 'download-solid' %>
+    <div class="flex hidden absolute max-w-xs bg-white rounded p-2 z-40" data-popover-target="content">
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :higher, svg: 'arrow-up' %>
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :lower, svg: 'arrow-down' %>
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :to_top, svg: 'download-solid-reversed' %>
+      <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :to_bottom, svg: 'download-solid' %>
     </div>
-  </div>
+  <% end %>
 </div>

data/app/components/avo/index/ordering/buttons_component.rb

@@ -1,19 +1,45 @@
 # frozen_string_literal: true
 
 class Avo::Index::Ordering::ButtonsComponent < Avo::Index::Ordering::BaseComponent
-  def initialize(resource: nil)
+  def initialize(resource: nil, reflection: nil, view_type: nil)
     @resource = resource
+    @reflection = reflection
+    @view_type = view_type
   end
 
   def render?
-    can_order_any?
+    has_with_trial(:resource_ordering) && can_order_any? && view_type_is_table? && enabled_in_view?
   end
 
+  private
+
   def can_order_any?
     order_actions.present?
   end
 
-  def always_visible?
-    @resource.class.ordering[:always_visible]
+  def view_type_is_table?
+    @view_type.to_sym == :table
+  end
+
+  def display_inline?
+    ordering[:display_inline]
+  end
+
+  def enabled_in_view?
+    in_association = @reflection.present?
+
+    if in_association
+      visible_on_option.include? :association
+    else
+      visible_on_option.include? :index
+    end
+  end
+
+  def visible_on_option
+    [ordering[:visible_on]].flatten
+  end
+
+  def ordering
+    @resource.class.ordering
   end
 end

data/app/components/avo/index/resource_controls_component.html.erb

@@ -1,7 +1,5 @@
 <div class="space-x-2 flex flex-row justify-around items-center w-full">
-  <% if view_is_table? && has_with_trial(:resource_ordering) %>
-    <%= render Avo::Index::Ordering::ButtonsComponent.new resource: @resource %>
-  <% end %>
+  <%= render Avo::Index::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type %>
 
   <% if can_view? %>
     <%= link_to helpers.svg('eye', class: 'text-gray-400 h-6 hover:text-gray-600'),

data/app/components/avo/index/resource_controls_component.rb

@@ -70,8 +70,4 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   def is_has_many_association
     @reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
   end
-
-  def view_is_table?
-    @view_type == :table
-  end
 end

data/app/components/avo/resource_component.rb

@@ -30,25 +30,4 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
     association_policy
   end
-
-  private
-
-  # Figure out what is the corresponding field for this @reflection
-  def field
-    fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
-    fields.find { |f| f.id == @reflection.name }
-  rescue
-    nil
-  end
-
-  def relation_resource
-    ::Avo::App.get_resource_by_model_name params[:via_resource_class].safe_constantize
-  end
-
-  # Get the resource for the resource using the klass attribute so we get the namespace too
-  def reflection_resource
-    ::Avo::App.get_resource_by_model_name(@reflection.klass.to_s)
-  rescue
-    nil
-  end
 end

data/app/controllers/avo/base_controller.rb

@@ -192,10 +192,12 @@ module Avo
 
     def order
       direction = params[:direction].to_sym
-      order_actions = @resource.class.order_actions
 
-      if direction.present? && order_actions[direction].present?
-        order_actions[direction].call(@model)
+      if direction.present?
+        @resource
+          .hydrate(model: @model, params: params)
+          .ordering_host
+          .order direction
       end
 
       respond_to do |format|

data/app/controllers/avo/relations_controller.rb

@@ -2,15 +2,15 @@ require_dependency "avo/base_controller"
 
 module Avo
   class RelationsController < BaseController
-    before_action :set_model, only: [:show, :index, :new, :create, :destroy]
+    before_action :set_model, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_resource_name
-    before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy]
-    before_action :hydrate_related_resource, only: [:show, :index, :new, :create, :destroy]
-    before_action :set_related_model, only: [:show]
-    before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy]
-    before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy]
-    before_action :set_attachment_model, only: [:create, :destroy]
-    before_action :set_reflection, only: [:index, :show]
+    before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :hydrate_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :set_related_model, only: [:show, :order]
+    before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :set_attachment_model, only: [:create, :destroy, :order]
+    before_action :set_reflection, only: [:index, :show, :order]
 
     def index
       @parent_resource = @resource.dup
@@ -34,10 +34,20 @@ module Avo
     end
 
     def new
-      query = @authorization.apply_policy @attachment_class
+      @resource.hydrate(model: @model)
 
-      @options = query.all.map do |model|
-        [model.send(@attachment_resource.class.title), model.id]
+      begin
+        @field = @resource.get_field_definitions.find { |f| f.id == @related_resource_name.to_sym }
+        @field.hydrate(resource: @resource, model: @model, view: :new)
+      rescue
+      end
+
+      if @field.present? && !@field.searchable
+        query = @authorization.apply_policy @attachment_class
+
+        @options = query.all.map do |model|
+          [model.send(@attachment_resource.class.title), model.id]
+        end
       end
     end
 
@@ -50,7 +60,7 @@ module Avo
 
       respond_to do |format|
         if @model.save
-          format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @attachment_class) }
+          format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
           format.json { render :show, status: :created, location: resource_path(model: @model, resource: @resource) }
         else
           format.html { render :new }
@@ -71,6 +81,13 @@ module Avo
       end
     end
 
+    def order
+      @parent_resource = @resource.dup
+      @resource, @model = @related_resource, @related_model
+
+      super
+    end
+
     private
 
     def set_attachment_class

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

@@ -6,22 +6,25 @@
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
       <% c.heading do %>
-        <%= t 'avo.choose_item', item: params[:related_name].downcase %>
+        <%= t 'avo.choose_item', item: @related_resource.name.downcase %>
       <% end %>
-
       <div class="flex-1 flex items-center justify-center px-8 text-lg mt-8 mb-12">
-        <div class="flex-1 flex flex-col items-center justify-center px-24 text-base">
-          <%= form.select :related_id, options_for_select(@options, nil),
-            {
-              include_blank: t('avo.choose_an_option'),
-            },
-            {
-              class: input_classes('w-full'),
-            }
+        <% if @field.searchable %>
+          <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: form,
+            field: @field,
+            model_key: @field.target_resource&.model_key,
+            foreign_key: 'related_id',
+            resource: @resource
           %>
-        </div>
+        <% else %>
+          <div class="flex-1 flex flex-col items-center justify-center px-24 text-base">
+            <%= form.select :related_id, options_for_select(@options, nil),
+              { include_blank: t('avo.choose_an_option') },
+              { class: input_classes('w-full') }
+            %>
+          </div>
+        <% end %>
       </div>
-
       <% c.controls do %>
         <%= a_button t('avo.cancel'), 'data-action': 'click->modal#close', size: :sm %>
         <%= a_button t('avo.attach'), type: :submit, color: :green, size: :sm %>

data/avo.gemspec

@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
+  spec.add_dependency "dry-initializer"
 end

data/config/routes.rb

@@ -19,6 +19,7 @@ Avo::Engine.routes.draw do
 
     # Ordering
     patch "/:resource_name/:id/order", to: "resources#order"
+    patch "/:resource_name/:id/:related_name/:related_id/order", to: "relations#order", as: "associations_order"
 
     # Actions
     get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"

data/lib/avo/base_resource.rb

@@ -14,6 +14,7 @@ module Avo
 
     attr_accessor :view
     attr_accessor :model
+    attr_accessor :reflection
     attr_accessor :user
     attr_accessor :params
 
@@ -142,16 +143,16 @@ module Avo
             # we're matching the reflection inverse_of foriegn key with the field's foreign_key
             if field.is_a?(Avo::Fields::BelongsToField)
               if field.respond_to?(:foreign_key) &&
-                reflection.inverse_of.present? &&
-                reflection.inverse_of.foreign_key == field.foreign_key
+                  reflection.inverse_of.present? &&
+                  reflection.inverse_of.foreign_key == field.foreign_key
                 is_valid = false
               end
 
               # polymorphic association
               if field.respond_to?(:foreign_key) &&
-                field.is_polymorphic? &&
-                reflection.respond_to?(:polymorphic?) &&
-                reflection.inverse_of.foreign_key == field.reflection.foreign_key
+                  field.is_polymorphic? &&
+                  reflection.respond_to?(:polymorphic?) &&
+                  reflection.inverse_of.foreign_key == field.reflection.foreign_key
                 is_valid = false
               end
             end
@@ -477,5 +478,9 @@ module Avo
     def form_scope
       model_class.base_class.to_s.underscore.downcase
     end
+
+    def ordering_host(**args)
+      Avo::Hosts::Ordering.new resource: self, options: self.class.ordering, **args
+    end
   end
 end

data/lib/avo/fields/base_field.rb

@@ -7,7 +7,7 @@ module Avo
       include ActionView::Helpers::UrlHelper
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
-      delegate :view_context, to: 'Avo::App'
+      delegate :view_context, to: "Avo::App"
       delegate :main_app, to: :view_context
       delegate :avo, to: :view_context
 

data/lib/avo/fields/belongs_to_field.rb

@@ -74,7 +74,7 @@ module Avo
       end
 
       def searchable
-        @searchable && ::Avo::App.license.has_with_trial(:searchable_belongs_to)
+        @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
       end
 
       def value

data/lib/avo/fields/has_base_field.rb

@@ -7,8 +7,13 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @display = args[:display].present? ? args[:display] : :show
         @scope = args[:scope].present? ? args[:scope] : nil
+        @display = args[:display].present? ? args[:display] : :show
+        @searchable = args[:searchable] == true
+      end
+
+      def searchable
+        @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
       end
 
       def resource
@@ -23,6 +28,20 @@ module Avo
         "#{@resource.record_path}/#{id}?turbo_frame=#{turbo_frame}"
       end
 
+      # The value
+      def field_value
+        value.send(database_value)
+      rescue
+        nil
+      end
+
+      # What the user sees in the text field
+      def field_label
+        value.send(target_resource.class.title)
+      rescue
+        nil
+      end
+
       def target_resource
         if @model._reflections[id.to_s].klass.present?
           Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
@@ -32,6 +51,10 @@ module Avo
           Avo::App.get_resource_by_name id.to_s
         end
       end
+
+      def placeholder
+        @placeholder || I18n.t("avo.choose_an_option")
+      end
     end
   end
 end

data/lib/avo/hosts/ordering.rb

@@ -0,0 +1,22 @@
+require 'dry-initializer'
+
+module Avo
+  module Hosts
+    class Ordering
+      extend Dry::Initializer
+
+      option :options, default: proc { {} }
+      option :resource
+      option :record, default: proc { resource.model }
+      option :params, default: proc { resource.params }
+
+      def order(direction)
+        action = options.dig(:actions, direction.to_sym)
+
+        if action.present?
+          instance_exec(&action)
+        end
+      end
+    end
+  end
+end

data/lib/avo/licensing/pro_license.rb

@@ -8,8 +8,8 @@ module Avo
           :custom_fields,
           :global_search,
           :enhanced_search_results,
-          :searchable_belongs_to,
-          :resource_ordering,
+          :searchable_associations,
+          :resource_ordering
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.24.0"
+  VERSION = "1.25.0"
 end

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -95,3 +95,9 @@ en:
     was_successfully_updated: 'was successfully updated'
     clear_value: "Clear value"
     tools: Tools
+    order:
+      reorder_record: Reorder record
+      higher: Move record higher
+      lower: Move record lower
+      to_top: Move record to top
+      to_bottom: Move record to bottom