avo 1.24.1 → 1.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07dcdf41c01ae279e2cfcd9df2cfcafa425631eb55f62683cd3840265d940929
-  data.tar.gz: 138598c44f46114939d9c6e0aa3a7cc2b07c36a4c6a4bf4092371fed1304a610
+  metadata.gz: 4990a8b947c8086e635f9a4efedf7b58692ffbeebcd7bbc5ee002f8526a0e1fc
+  data.tar.gz: 80f48c2eaf8dbe17271afbb64dfb07e3c7b2710371dd049d293981ed0ddf2cb3
 SHA512:
-  metadata.gz: e76cb0cd3f45b95f5415f68eb467a9bdb65a254b78c2a1e60803903a0b2a52f34b1b1872be770443c4c9505b3dfab0bb526688867a9c6efc8eae2904a0fc9cd1
-  data.tar.gz: df4ca3e819a13d3a1730f426b14625ab582fdc9460afa1d3bde5b200fe63e9573fa976e9a5d961318357317149aa5dc3b9127673e661ca0cc1532fb0e1d000de
+  metadata.gz: 53cdb462a0b8dbb76060ab440760115b309c05d16dbbde23108811b1b369eeb4a59763d908ff4f5466fe15596f35427817443c146994d9c4466cb2955cdbb6e0
+  data.tar.gz: 83afde6824181a8354d20fb8d9197734abc3d162200625731a47f2adf17501f43f1d08abf897f3e60fbe01960893d2ad71ef2ba4fee540b2c4f943859199eb2a

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    avo (1.24.1)
+    avo (1.24.2)
       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)

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/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
@@ -71,6 +71,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/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
 
@@ -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/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/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.24.1"
+  VERSION = "1.24.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 1.24.1
+  version: 1.24.2
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-initializer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Avo is a beautiful next-generation framework that empowers you, the developer,
   to create fantastic admin panels for your Ruby on Rails apps with the flexibility
   to fit your needs as you grow.
@@ -644,6 +658,7 @@ files:
 - lib/avo/grid_fields/preview_field.rb
 - lib/avo/grid_fields/title_field.rb
 - lib/avo/has_context.rb
+- lib/avo/hosts/ordering.rb
 - lib/avo/licensing/community_license.rb
 - lib/avo/licensing/h_q.rb
 - lib/avo/licensing/license.rb