avo 2.24.0 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60faee4dc37aadd6cd825e07a6b0f75cb99d7d11b49ecf2cebd8f88862dc1899
-  data.tar.gz: 12aa335762c14fe85e18b61931dec31e97afa71a86c5f048a33d7f18fdec1201
+  metadata.gz: f44b08c9a7b54364ae4baf4d7f0947fd61de44b2cf92e1fc434ed93e7410ca4f
+  data.tar.gz: ad282ef2dfede35333d11dc090a059bc874bf8996c3dc991b5c939bf2dfa3dc9
 SHA512:
-  metadata.gz: ac936588c00117a18bfb5515450c044787851fa95fde94e63f1d74ad7dfb3d1b7b1f72401764dd72ed0b7207e48e27aa3520663b1044377f9208f5b1707add7d
-  data.tar.gz: bbb926db8935c89225a99a8e4f56cfce3d2f3e6c1a5fa5cfa234e8b99f0df7f6ad20c871bfe7a535e4be916eed6db2e0b279752302772665e9a847fe12c6958e
+  metadata.gz: 2cfea44f9fabc5835fc132591a486e18469b3a8757c28d9573254defa9b6890278b7e8c5b8b8fa1eb4dc695241b2c8f28620a56a460adc2b236c09e57ff32b0c
+  data.tar.gz: 47126c8a1194483bd615fcf694c3cbe1a74b3fee5e8fc8d11b1bfa1b83d8c6f0b437c5e424a1ddc3b67857b06d8aa7e5f28f6f36b254b7f28209212da2aa867f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.24.0)
+    avo (2.25.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -264,7 +264,7 @@ GEM
     nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (6.0.0)
+    pagy (6.0.1)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
@@ -407,7 +407,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
-    view_component (2.81.0)
+    view_component (2.82.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

data/app/views/avo/partials/_table_header.html.erb

@@ -44,7 +44,13 @@
           ""
         end
     %>
-    <th class="text-left uppercase px-3 py-3 whitespace-nowrap rounded-l" data-control="resource-field-th">
+    <%= content_tag :th,
+      class: "text-left uppercase px-3 py-3 whitespace-nowrap rounded-l",
+      data: {
+        control: "resource-field-th",
+        table_header_field_id: field.id,
+        table_header_field_type: field.type,
+      } do %>
       <% if field.sortable %>
         <%= link_to params.permit!.merge(sort_by: sort_by, sort_direction: sort_direction), class: "flex items-center #{classes} #{'cursor-pointer' if field.sortable}", 'data-turbo-frame': params[:turbo_frame] do %>
           <%= field.name %>
@@ -55,7 +61,7 @@
           <%= field.name %>
         </div>
       <% end %>
-    </th>
+    <% end %>
   <% end %>
   <% if Avo.configuration.resource_controls_on_the_right? %>
     <th class="w-24" data-control="resource-controls-th">

data/db/factories.rb

@@ -31,7 +31,7 @@ FactoryBot.define do
 
   factory :project do
     name { Faker::App.name }
-    status { [:closed, :rejected, :failed, :loading, :running, :waiting].sample }
+    status { ['closed', :rejected, :failed, 'loading', :running, :waiting].sample }
     stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled"].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }

data/lib/avo/fields/status_field.rb

@@ -4,8 +4,8 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten : [:waiting, :running]
-        @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten : [:failed]
+        @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten.map(&:to_sym) : [:waiting, :running]
+        @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten.map(&:to_sym) : [:failed]
       end
 
       def status

data/lib/avo/version.rb

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

data/lib/generators/avo/resource_generator.rb

@@ -18,19 +18,19 @@ module Generators
       end
 
       def resource_class
-        "#{class_name}Resource"
+        "#{class_name.remove(":")}Resource"
       end
 
       def controller_class
-        "Avo::#{class_name.camelize.pluralize}Controller"
+        "Avo::#{class_name.remove(":").pluralize}Controller"
       end
 
       def resource_name
-        "#{singular_name}_resource"
+        "#{model_resource_name}_resource"
       end
 
       def controller_name
-        "#{plural_name}_controller"
+        "#{model_resource_name.pluralize}_controller"
       end
 
       def current_models
@@ -40,11 +40,13 @@ module Generators
       end
 
       def class_from_args
-        @class_from_args ||= options["model-class"]&.capitalize
+        @class_from_args ||= options["model-class"]&.camelize || (class_name if class_name.include?("::"))
       end
 
       def model_class_from_args
-        "\n  self.model_class = ::#{class_from_args}" if class_from_args.present?
+        if class_from_args.present? || class_name.include?("::")
+          "\n  self.model_class = ::#{class_from_args || class_name}"
+        end
       end
 
       private
@@ -58,7 +60,7 @@ module Generators
       end
 
       def model_db_columns
-        @model_db_columns ||= model.columns_hash.reject { |name, _| db_columns_to_ignore.include? name }
+        @model_db_columns ||= model.columns_hash.except(*db_columns_to_ignore)
       end
 
       def db_columns_to_ignore
@@ -155,14 +157,30 @@ module Generators
 
       def fields_from_model_associations
         associations.each do |name, association|
-          fields[name] = associations_mapping[association.class]
-
-          if association.is_a? ActiveRecord::Reflection::ThroughReflection
-            fields[name][:options][:through] = ":#{association.options[:through]}"
+          fields[name] = if association.is_a? ActiveRecord::Reflection::ThroughReflection
+            field_from_through_association(association)
+          else
+            associations_mapping[association.class]
           end
         end
       end
 
+      def field_from_through_association(association)
+        if association.through_reflection.is_a? ActiveRecord::Reflection::HasManyReflection
+          {
+            field: "has_many",
+            options: {
+              through: ":#{association.options[:through]}"
+            }
+          }
+        else
+          # If the through_reflection is not a HasManyReflection, add it to the fields hash using the class of the through_reflection
+          # ex (team.rb): has_one :admin, through: :admin_membership, source: :user
+          # we use the class of the through_reflection (HasOneReflection -> has_one :admin) to generate the field
+          associations_mapping[association.through_reflection.class]
+        end
+      end
+
       def fields_from_model_attachements
         attachments.each do |name, attachment|
           fields[remove_last_word_from name] = attachments_mapping[attachment.class]
@@ -210,12 +228,6 @@ module Generators
           ActiveRecord::Reflection::HasManyReflection => {
             field: "has_many"
           },
-          ActiveRecord::Reflection::ThroughReflection => {
-            field: "has_many",
-            options: {
-              through: ":..."
-            }
-          },
           ActiveRecord::Reflection::HasAndBelongsToManyReflection => {
             field: "has_and_belongs_to_many"
           }

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

@@ -17,7 +17,8 @@ Avo.configure do |config|
 
   ## == Authentication ==
   # config.current_user_method = {}
-  # config.authenticate_with = {}
+  # config.authenticate_with do
+  # end
 
   ## == Authorization ==
   # config.authorization_methods = {
@@ -76,8 +77,9 @@ Avo.configure do |config|
   #   },
   #   chart_colors: ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"],
   #   logo: "/avo-assets/logo.png",
-  #   logomark: "/avo-assets/logomark.png"
-  #   placeholder: "/avo-assets/placeholder.svg"
+  #   logomark: "/avo-assets/logomark.png",
+  #   placeholder: "/avo-assets/placeholder.svg",
+  #   favicon: "/avo-assets/favicon.ico"
   # }
 
   ## == Breadcrumbs ==

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.25.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord