avo 3.5.0 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff3e9f78fc82e1a9a80221261f1aa29fec6f2efc670d590d8837c5a9224e1af
-  data.tar.gz: fd5fb058686183dd40daeeaf5a112648e4a6162668056ce871ced723a1471fc6
+  metadata.gz: b09b96bd49a61cf405e01532f30b33471437b1b354efad21ccd3c0ad193fdc90
+  data.tar.gz: b35e575c1787a34a5b1a2185127f39075b808d833993d3bd8584ea877dc14035
 SHA512:
-  metadata.gz: 89b46f1776ec508ca2f11343dfeb77cce80863ffbf984f4535281a22f5fa129721b819abaeca0fc3c83a95121aed822f27ef78abbe43326a13bb6d23b3e175bf
-  data.tar.gz: 18e81a302f60c0eac7717d62e71cb6a18bcceb6108a3b60bacd92ec17b5c2b99fe898453759213abcf52be79d6212f34483697a98ec1b25aaf1ad6cf560359c6
+  metadata.gz: 87e3e97b4e3e001080341a61565e97674d5e7ba9703a980bae1d769180afb648d5a0dff42d7901b5f42370a2915eb689951bff02cba33cb3183a634faa3c726b
+  data.tar.gz: a9841007e4c2226651a0c3b86d5ed25b189f2ad5fceb258bf23f79a8c5931cfcaefa68d8657e895483404c45f6fb8064e5c4b418db5b3282cc2fe7cb2d8e485c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.5.0)
+    avo (3.5.2)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

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

@@ -4,7 +4,7 @@
   <%== item_selector_init @resource %>
   data-resource-name="<%= @resource.class.to_s %>"
   data-record-id="<%= @resource.record.id %>"
-  <%= drag_reorder_item_attributes %>
+  <%= try :drag_reorder_item_attributes %>
 >
   <%= content_tag :div,
     class: "relative w-full pb-3/4 rounded-t overflow-hidden #{html(:cover, :classes)}",

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

@@ -2,7 +2,6 @@
 
 class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
-  include Avo::Concerns::CanReorderItems
   include Avo::Fields::Concerns::HasHTMLAttributes
 
   attr_reader :parent_resource, :actions

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

@@ -1,9 +1,4 @@
 <div class="space-x-2 flex flex-row justify-end w-full">
-  <% if can_dnd_reorder? %>
-    <div class="handle">
-      <%= helpers.svg 'heroicons/outline/bars-3', class: 'text-gray-400 h-6 hover:text-gray-600 cursor-pointer' %>
-    </div>
-  <% end %>
   <% @resource.render_row_controls(item: singular_resource_name).each do |control| %>
     <%= render_control control %>
   <% end %>

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

@@ -2,7 +2,6 @@
 
 class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   include Avo::ApplicationHelper
-  include Avo::Concerns::CanReorderItems
 
   def initialize(resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, view_type: :table, actions: nil)
     @resource = resource
@@ -162,7 +161,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def render_order_controls(control)
-    if can_reorder?
+    if try(:can_reorder?)
       render Avo::Pro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
     end
   end

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

@@ -1,7 +1,7 @@
 <% if @resources.present? %>
   <turbo-frame id="<%= @resource.model_key %>_list" target="_top" class="relative w-full">
     <div class="w-full grid grid-cols-1 xs:grid-cols-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6 mt-8"
-    <%= drag_reorder_attributes %>
+    <%= try :drag_reorder_attributes %>
     data-component-name="<%= self.class.to_s.underscore %>"
     data-selected-resources-name="<%= @resource.model_key %>" data-selected-resources="[]">
       <% @resources.each_with_index do |resource, index| %>

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceGridComponent < Avo::BaseComponent
-  include Avo::Concerns::CanReorderItems
   attr_reader :actions
 
   def initialize(resources: nil, resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, actions: nil)

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

@@ -39,7 +39,7 @@
     <% end %>
     <table class="w-full px-4 bg-white">
       <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection, only_root: true)} %>
-      <tbody class="divide-y" <%= drag_reorder_attributes %>>
+      <tbody class="divide-y" <%= try :drag_reorder_attributes %>>
         <% @resources.each_with_index do |resource, index| %>
           <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_record), expires_in: 1.day do %>
             <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, actions: @actions) %>

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

@@ -2,7 +2,6 @@
 
 class Avo::Index::ResourceTableComponent < Avo::BaseComponent
   include Avo::ApplicationHelper
-  include Avo::Concerns::CanReorderItems
   attr_reader :pagy, :query
 
   def initialize(resources: nil, resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, pagy: nil, query: nil, actions: nil)

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

@@ -5,7 +5,7 @@
   <%== item_selector_init @resource %>
   data-resource-name="<%= @resource.class.to_s %>"
   data-record-id="<%= @resource.record.id %>"
-  <%= drag_reorder_item_attributes %>
+  <%= try :drag_reorder_item_attributes %>
 >
   <% if @resource.record_selector %>
     <td class="w-10">

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

@@ -2,7 +2,6 @@
 
 class Avo::Index::TableRowComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
-  include Avo::Concerns::CanReorderItems
 
   def initialize(resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, actions: nil)
     @resource = resource

data/app/components/avo/resource_component.rb

@@ -1,4 +1,6 @@
 class Avo::ResourceComponent < Avo::BaseComponent
+  include Avo::Concerns::ChecksAssocAuthorization
+
   attr_reader :fields_by_panel
   attr_reader :has_one_panels
   attr_reader :has_many_panels
@@ -7,8 +9,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
   attr_reader :resource
   attr_reader :view
 
-  include Avo::Concerns::ChecksAssocAuthorization
-
   def can_create?
     return authorize_association_for(:create) if @reflection.present?
 

data/lib/avo/base_resource.rb

@@ -177,24 +177,27 @@ module Avo
       end
 
       def name
-        default = class_name.underscore.humanize
-
-        if translation_key
-          t(translation_key, count: 1, default: default).humanize
-        else
-          default
-        end
+        name_from_translation_key(count: 1, default: class_name.underscore.humanize)
       end
       alias_method :singular_name, :name
 
       def plural_name
-        default = name.pluralize
+        name_from_translation_key(count: 2, default: name.pluralize)
+      end
 
-        if translation_key
-          t(translation_key, count: 2, default: default).humanize
-        else
-          default
-        end
+      # Get the name from the translation_key and fallback to default
+      # It can raise I18n::InvalidPluralizationData when using only resource_translation without pluralization keys like: one, two or other key
+      # Example:
+      # ---
+      # en:
+      #   avo:
+      #     resource_translations:
+      #       product:
+      #         save: "Save product"
+      def name_from_translation_key(count:, default:)
+        t(translation_key, count:, default:).humanize
+      rescue I18n::InvalidPluralizationData
+        default
       end
 
       def underscore_name
@@ -448,14 +451,14 @@ module Avo
     def file_hash
       content_to_be_hashed = ""
 
-      # resource file hash
-      resource_path = Rails.root.join("app", "avo", "resources", "#{self.class.name.underscore}.rb").to_s
+      file_name = self.class.underscore_name.tr(" ", "_")
+      resource_path = Rails.root.join("app", "avo", "resources", "#{file_name}.rb").to_s
       if File.file? resource_path
         content_to_be_hashed += File.read(resource_path)
       end
 
       # policy file hash
-      policy_path = Rails.root.join("app", "policies", "#{self.class.name.underscore.gsub("_resource", "")}_policy.rb").to_s
+      policy_path = Rails.root.join("app", "policies", "#{file_name.gsub("_resource", "")}_policy.rb").to_s
       if File.file? policy_path
         content_to_be_hashed += File.read(policy_path)
       end

data/lib/avo/concerns/has_controls.rb

@@ -16,7 +16,7 @@ module Avo
       end
 
       def render_edit_controls
-        [BackButton.new(label: I18n.t("avo.cancel").capitalize), DeleteButton.new, ActionsList.new, SaveButton.new]
+        [BackButton.new(label: I18n.t("avo.cancel").capitalize), DeleteButton.new, ActionsList.new, SaveButton.new(resource: self)]
       end
 
       def render_index_controls(item:)

data/lib/avo/resources/controls/save_button.rb

@@ -5,7 +5,10 @@ module Avo
         def initialize(**args)
           super(**args)
 
-          @label = args[:label] || I18n.t("avo.save").capitalize
+          @label = args[:label] || I18n.t(
+            "#{args[:resource].translation_key}.save",
+            default: I18n.t("avo.save")
+          ).capitalize
         end
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.5.0" unless const_defined?(:VERSION)
+  VERSION = "3.5.2" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.2
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -2170,7 +2170,6 @@ files:
 - lib/avo/base_resource_tool.rb
 - lib/avo/concerns/borrow_items_holder.rb
 - lib/avo/concerns/breadcrumbs.rb
-- lib/avo/concerns/can_reorder_items.rb
 - lib/avo/concerns/can_replace_items.rb
 - lib/avo/concerns/checks_assoc_authorization.rb
 - lib/avo/concerns/filters_session_handler.rb

data/lib/avo/concerns/can_reorder_items.rb

@@ -1,29 +0,0 @@
-module Avo
-  module Concerns
-    module CanReorderItems
-      extend ActiveSupport::Concern
-
-      included do
-        if defined? Avo::Pro::Concerns::CanReorderItems
-          include Avo::Pro::Concerns::CanReorderItems
-        end
-      end
-
-      def can_reorder?
-        false
-      end
-
-      def can_dnd_reorder?
-        false
-      end
-
-      def drag_reorder_attributes
-        ""
-      end
-
-      def drag_reorder_item_attributes
-        ""
-      end
-    end
-  end
-end