avo 2.11.3.pre.1 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6322eef586c1cf132343d666fa513b2733699349d2945a86ddb2b37669cfcd1c
-  data.tar.gz: 5fb654449921d9fde5312adbeee074f96752445c34416ea4a6a22e6c5f9be9df
+  metadata.gz: cb6907b0e852005ad23b73029892ac673ef73f955afe6b317d61c0c9303d3ef3
+  data.tar.gz: 980fbca1412954ea0e5d1f75ae12e653cd10bfb58307a2fec1a8eafc08c51852
 SHA512:
-  metadata.gz: 8c9ee8afe73d49806a42032b5c3f2b8c49a05763d44048e44c55ab4831d30c475ad2792cb6ad11ce5bd8ce296202c20173dd8bf274b05c64f6ac60174835953b
-  data.tar.gz: f22c15ebaaee96768cd5c38c2935a513410a32a5e46729b22c4c8375c1b7a229b4e3e733572f3fe47207229bae4775ce3a5510c528a532759c81b8b2b0b39fc7
+  metadata.gz: c43462a617f2bb6131b899665687ab371823a2c983338f32d095e0b33dfd543a4e3488e94b03f8e6dec1b7ed6162c0fa86d1cbacfde7b1cf07ef6ed5120192e6
+  data.tar.gz: e06be5c7fd0c244f683d4bf9960892dac729dc155bbc90f0903758ba3beca5a0394feea932db9c8d67c3ef2836fcf03a1e0056efcb90f8fded28998969cb6e56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.3.pre.1)
+    avo (2.12.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -252,8 +252,6 @@ GEM
     nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.7-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport

data/app/components/avo/actions_component.html.erb

@@ -3,9 +3,9 @@
   data-actions-picker-enabled-class="text-black hover:bg-blue-500 hover:text-white"
   data-actions-picker-disabled-class="cursor-wait text-gray-500"
 >
-  <%= a_button style: @style,
+  <%= a_button style: :outline,
     type: :button,
-    color: @color,
+    color: :primary,
     class: "focus:outline-none",
     icon: 'arrow-circle-right',
     icon_class: 'transform rotate-90',
@@ -18,7 +18,7 @@
     data-toggle-panel-target="panel"
   >
     <div class="w-full space divide-y">
-      <% actions.each_with_index do |action, index| %>
+      <% @actions.each_with_index do |action, index| %>
         <%= link_to action_path(action.param_id),
           data: {
             'turbo-frame': 'actions_show',

data/app/components/avo/actions_component.rb

@@ -3,23 +3,14 @@
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :blue)
-    @actions = actions || []
+  def initialize(actions: [], resource: nil, view: nil)
+    @actions = actions
     @resource = resource
     @view = view
-    @exclude = exclude
-    @color = color
-    @style = style
   end
 
   def render?
-    actions.present?
-  end
-
-  def actions
-    @actions.select do |action|
-      !action.class.in?(@exclude)
-    end
+    @actions.present?
   end
 
   # When running an action for one record we should do it on a special path.

data/app/components/avo/button_component.rb

@@ -43,7 +43,9 @@ class Avo::ButtonComponent < ViewComponent::Base
     classes = "button-component inline-flex flex-grow-0 items-center font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 border justify-center active:outline active:outline-1 #{@class}"
 
     classes += " rounded" if @rounded.present?
+
     classes += style_classes
+
     classes += horizontal_padding_classes
     classes += vertical_padding_classes
     classes += text_size_classes
@@ -149,7 +151,7 @@ class Avo::ButtonComponent < ViewComponent::Base
   def style_classes
     case @style
     when :primary
-      " bg-#{@color}-500 text-white border-#{@color}-500 hover:bg-#{@color}-600 hover:border-#{@color}-600 active:border-#{@color}-700 active:outline-#{@color}-700 active:bg-#{@color}-600"
+      " bg-primary-500 text-white border-primary-500 hover:bg-primary-600 hover:border-primary-600 active:border-primary-700 active:outline-primary-700 active:bg-primary-600"
     when :outline
       " bg-white text-#{@color}-500 border-#{@color}-500 hover:bg-#{@color}-100 active:bg-#{@color}-100 active:border-#{@color}-500 active:outline-#{@color}-500"
     when :text

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

@@ -9,7 +9,7 @@
   <% else %>
     <div class="popover inline-block"
       data-controller="popover"
-      data-popover-translate-x="-100%"
+      data-popover-translate-x="<%= Avo.configuration.resource_controls_placement == :left ? '20%' : '-100%' %>"
       data-popover-translate-y="-32px"
       data-action="mouseover->popover#mouseOver mouseout->popover#mouseOut"
       >

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

@@ -58,7 +58,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def singular_resource_name
     if @reflection.present?
-      reflection_resource.name
+      field&.name&.singularize || reflection_resource.name
     else
       @resource.singular_name.present? ? @resource.singular_name : @resource.model_class.model_name.name.downcase
     end

data/app/components/avo/panel_component.html.erb

@@ -17,7 +17,7 @@
         <% end %>
       </div>
       <% if tools.present? %>
-        <div class="flex-1 w-full flex flex-wrap flex-col sm:flex-row xl:justify-end sm:items-end gap-2 mt-4 xl:mt-0" data-target="panel-controls">
+        <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
           <%= tools %>
         </div>
       <% end %>

data/app/components/avo/resource_component.rb

@@ -22,12 +22,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
     authorize_association_for("detach")
   end
 
-  def detach_path
-    return "/" if @reflection.blank?
-
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
-  end
-
   def can_see_the_edit_button?
     @resource.authorization.authorize_action(:edit, raise_exception: false)
   end
@@ -36,6 +30,10 @@ class Avo::ResourceComponent < Avo::BaseComponent
     @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
+  def detach_path
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
+  end
+
   def destroy_path
     helpers.resource_path(model: @resource.model, resource: @resource)
   end

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

@@ -124,6 +124,8 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   def singular_resource_name
     if @reflection.present?
+      return name.singularize if field.present?
+      
       reflection_resource.name
     else
       @resource.singular_name || @resource.model_class.model_name.name.downcase

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

@@ -7,148 +7,58 @@
   } do %>
   <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
     <% c.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? %>
-            <% end %>
-            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
-                method: :delete,
-                local: true,
-                style: :text,
-                loading: true,
-                confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-                color: :red,
-                icon: 'trash',
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                title: control.title,
-                data: {
-                  control: :destroy,
-                  tippy: control.title ? :tooltip : nil,
-                  'resource-id': @resource.model.id,
-                } do %>
-            <% end %>
-          <% elsif control.actions_list? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, style: control.style, color: control.color %>
-          <% elsif control.edit_button? %>
-            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-            <% end %>
-            <%= a_link edit_path,
-                color: :primary,
-                style: :primary,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                },
-                icon: 'edit' do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif 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 %>
-          <% 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 %>
-                <%= t('avo.detach_item', item: title).capitalize %>
-              <% end %>
-            <% end %>
+      <% 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).capitalize %>
           <% 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).capitalize %>
-            <% 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 %>
-          <%= 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,
+        <% end %>
+      <% else %>
+        <%= a_link back_path,
+          style: :text,
+          icon: 'arrow-left' do %>
+          <%= t('avo.go_back') %>
+        <% end %>
+        <% if can_see_the_destroy_button? %>
+          <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+            method: :delete,
+            local: true,
             style: :text,
-            icon: 'arrow-left' do %>
-            <%= t('avo.go_back') %>
+            loading: true,
+            confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+            color: :red,
+            icon: 'trash',
+            form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+            data: {
+              control: :destroy,
+              'resource-id': @resource.model.id,
+            } do %>
+            <%= t('avo.delete').capitalize %>
           <% end %>
-          <% if can_see_the_destroy_button? %>
-            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
-                method: :delete,
-                local: true,
-                style: :text,
-                loading: true,
-                confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-                color: :red,
-                icon: 'trash',
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                data: {
-                  control: :destroy,
-                  'resource-id': @resource.model.id,
-                } do %>
-              <%= t('avo.delete').capitalize %>
-            <% end %>
-          <% end %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-          <% 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 %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+        <% 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 %>

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

@@ -17,7 +17,6 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   def title
     if @reflection.present?
       return field.name if has_one_field?
-
       reflection_resource.name
     else
       @resource.default_panel_name

data/app/controllers/avo/application_controller.rb

@@ -207,6 +207,11 @@ module Avo
     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

data/app/controllers/avo/associations_controller.rb

@@ -102,7 +102,7 @@ module Avo
     end
 
     def set_attachment_resource
-      @attachment_resource = App.get_resource_by_model_name @attachment_class
+      @attachment_resource = @field.use_resource || (App.get_resource_by_model_name @attachment_class)
     end
 
     def set_attachment_model

data/app/views/avo/debug/report.html.erb

@@ -9,7 +9,6 @@
   </div>
   <div class="flex justify-end">
     <%= a_button icon: 'heroicons/outline/clipboard',
-      color: :primary,
       style: :primary,
       data: {
         controller: 'copy-to-clipboard',

data/app/views/avo/private/design.html.erb

@@ -1,7 +1,7 @@
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.tools do %>
-      <%= a_link('/admin', icon: 'arrow-left', color: :green, style: :primary, is_link: true) do %>
+      <%= a_link('/admin', icon: 'arrow-left', style: :primary, is_link: true) do %>
         Primary
       <% end %>
 

data/lib/avo/base_resource.rb

@@ -3,8 +3,8 @@ module Avo
     extend ActiveSupport::DescendantsTracker
 
     include ActionView::Helpers::UrlHelper
+    include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
-    include Avo::Concerns::HasEditableControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
 
@@ -439,9 +439,5 @@ module Avo
     def ordering_host(**args)
       Avo::Hosts::Ordering.new resource: self, options: self.class.ordering, **args
     end
-
-    def has_model_id?
-      model.present? && model.id.present?
-    end
   end
 end

data/lib/avo/concerns/has_model.rb

@@ -0,0 +1,11 @@
+module Avo
+  module Concerns
+    module HasModel
+      extend ActiveSupport::Concern
+
+      def has_model_id?
+        model.present? && model.id.present?
+      end
+    end
+  end
+end

data/lib/avo/fields/base_field.rb

@@ -112,14 +112,12 @@ module Avo
       # Secondly we'll try to find a translation key
       # We'll fallback to humanizing the id
       def name
-        default = @id.to_s.humanize(keep_id_suffix: true)
-
         return @name if custom_name?
 
         if translation_key && ::Avo::App.translation_enabled
-          t(translation_key, count: 1, default: default).capitalize
+          t(translation_key, count: 1, default: default_name).capitalize
         else
-          default
+          default_name
         end
       end
 
@@ -137,6 +135,10 @@ module Avo
         @name.present?
       end
 
+      def default_name
+        @id.to_s.humanize(keep_id_suffix: true)
+      end
+
       def placeholder
         return @placeholder if @placeholder.present?
 

data/lib/avo/fields/has_base_field.rb

@@ -15,6 +15,7 @@ module Avo
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
         @description = args[:description]
+        @use_resource = args[:use_resource] || nil
         @discreet_pagination = args[:discreet_pagination] || false
       end
 
@@ -22,12 +23,16 @@ module Avo
         @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
       end
 
+      def use_resource
+        App.get_resource @use_resource
+      end
+
       def resource
         Avo::App.get_resource_by_model_name @model.class
       end
 
       def turbo_frame
-        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{id}"
+        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{frame_id}"
       end
 
       def frame_url
@@ -91,6 +96,16 @@ module Avo
           true
         end
       end
+
+      def default_name
+        use_resource&.name || super
+      end
+
+      private
+
+      def frame_id
+        use_resource.present? ? use_resource.route_key.to_sym : @id
+      end
     end
   end
 end

data/lib/avo/licensing/pro_license.rb

@@ -15,7 +15,6 @@ module Avo
           :dashboards,
           :menu_editor,
           :stimulus_js_integration,
-          :resource_show_controls,
           :advanced_fields
         ]
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.11.3.pre.1" unless const_defined?(:VERSION)
+  VERSION = "2.12.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/action.tt

@@ -1,5 +1,5 @@
 class <%= class_name.camelize %> < Avo::BaseAction
-  self.name = "<%= name.underscore.humanize %>"
+  self.name = '<%= name.underscore.humanize %>'
 
   def handle(**args)
     models, fields, current_user, resource = args.values_at(:models, :fields, :current_user, :resource)

data/lib/generators/avo/templates/resource_tools/partial.tt

@@ -1,7 +1,7 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: "<%= human_name %>") do |c| %>
     <%% c.tools do %>
-      <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', color: :primary, style: :primary) do %>
+      <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', style: :primary) do %>
         Dummy link
       <%% end %>
     <%% end %>

data/lib/generators/avo/templates/standalone_action.tt

@@ -1,5 +1,5 @@
 class <%= class_name.camelize %> < Avo::BaseAction
-  self.name = "<%= name.underscore.humanize %>"
+  self.name = '<%= name.underscore.humanize %>'
   self.standalone = true
 
   def handle(fields:)