avo 2.24.1 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9af86b6e3a217455a722a02f0e63ac1730f3d38bc8cf437c2e7acf51e42393
-  data.tar.gz: 3ec156f8d9aa616fe254d91f676d365ce949407c7496b9deac4147213ac25868
+  metadata.gz: 2b61c2b5a2648aa08f89b080fe7f8a8c982ef10c51cb361aa24aa53f979dd060
+  data.tar.gz: 723c552907d3c861383006edea41a9b73da6c609bc87add39f4349569e427b9e
 SHA512:
-  metadata.gz: 6b36e26266d5f1db62580fcc1504e413bb037d5da0a6381bb7cb4785d9db64486f2c2d57d75ebb17ed1b8f21252bbda1c4ef2140ed659bfe62c2117a5c331955
-  data.tar.gz: 365bb62634783fb83f3a0a3e88fa48f0f35ab64eae9ddeca321ed91f8c1fdaf5468f99e851beb602c2688b2a20db0b956143850e3e09006c07807f6384178837
+  metadata.gz: dfbeee5e9548d1c94fee23facf94685393e0cd58fd0079e980ef67707ac52b0545d5aebd7f4e6b3b6b44962d1a3ca540f966c3586660b4582e92484159ac8a3d
+  data.tar.gz: eebb9b58090526d78af41e3736985788dc69aabe53b0fd9cc02e4b926a7c8debb7daf5b4a9d17e91b357b126500804ef8cf72152d834cfe1b68a04303c1bda88

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.24.1)
+    avo (2.26.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -19,40 +19,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actioncable (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailbox (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       mail (>= 2.7.1)
-    actionmailer (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailer (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.6.1)
-      actionview (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionpack (6.1.7.2)
+      actionview (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actiontext (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       nokogiri (>= 1.8.5)
-    actionview (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionview (6.1.7.2)
+      activesupport (= 6.1.7.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -62,22 +62,22 @@ GEM
       addressable
     active_median (0.3.3)
       activesupport (>= 5.2)
-    activejob (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activejob (6.1.7.2)
+      activesupport (= 6.1.7.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activerecord (6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activestorage (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activemodel (6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activerecord (6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activestorage (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.6.1)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -142,7 +142,7 @@ GEM
       xpath (~> 3.2)
     chartkick (4.2.1)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     countries (4.2.3)
       i18n_data (~> 0.16.0)
       sixarm_ruby_unaccent (~> 1.1)
@@ -157,6 +157,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    date (3.3.3)
     devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -171,7 +172,7 @@ GEM
       railties (>= 3.2)
     dry-initializer (3.1.1)
     erb-formatter (0.3.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -186,7 +187,7 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     gem-release (2.2.2)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     groupdate (6.1.0)
       activesupport (>= 5.2)
@@ -237,8 +238,11 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     manifester (0.1.8)
       rails (>= 6.0)
       zeitwerk
@@ -249,19 +253,24 @@ GEM
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     minitest (5.17.0)
     msgpack (1.5.6)
     multi_xml (0.6.0)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
     net-protocol (0.1.3)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.1)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.0.1)
@@ -274,24 +283,24 @@ GEM
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.1)
-    rack (2.2.5)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (6.1.6.1)
-      actioncable (= 6.1.6.1)
-      actionmailbox (= 6.1.6.1)
-      actionmailer (= 6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actiontext (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    rails (6.1.7.2)
+      actioncable (= 6.1.7.2)
+      actionmailbox (= 6.1.7.2)
+      actionmailer (= 6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actiontext (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       bundler (>= 1.15.0)
-      railties (= 6.1.6.1)
+      railties (= 6.1.7.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -300,14 +309,14 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    railties (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -404,7 +413,7 @@ GEM
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
     view_component (2.82.0)
@@ -431,7 +440,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/app/controllers/avo/application_controller.rb

@@ -128,11 +128,7 @@ module Avo
     end
 
     def set_model
-      @model = model_find_scope.find record_id
-    end
-
-    def record_id
-      params.permit(:id).dig(:id)
+      @model = model_find_scope.find params[:id]
     end
 
     def model_find_scope

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

@@ -1,6 +1,6 @@
-<style>
+<%= content_tag(:style, nonce: content_security_policy_nonce) do %>
   :root {
     <%= Avo.configuration.branding.css_colors %>
   }
-</style>
+<% end %>
 <%= favicon_link_tag Avo.configuration.branding.favicon %>

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/base_card.rb

@@ -89,7 +89,6 @@ module Avo
         5 => " h-[45rem]",
         6 => " h-[54rem]"
       }
-      # puts ["cols->", cols, classes_for_cols, classes_for_rows, classes_for_cols[cols.to_i]].inspect
 
       result += classes_for_cols[cols.to_i] if classes_for_cols[cols.to_i].present?
       result += classes_for_rows[rows.to_i] if classes_for_rows[rows.to_i].present?
@@ -98,9 +97,9 @@ module Avo
     end
 
     def type
-      return :metric if self.class.superclass == ::Avo::Dashboards::MetricCard
-      return :chartkick if self.class.superclass == ::Avo::Dashboards::ChartkickCard
-      return :partial if self.class.superclass == ::Avo::Dashboards::PartialCard
+      return :metric if is_a?(::Avo::Dashboards::MetricCard)
+      return :chartkick if is_a?(::Avo::Dashboards::ChartkickCard)
+      return :partial if is_a?(::Avo::Dashboards::PartialCard)
     end
 
     def compute_result

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.1" unless const_defined?(:VERSION)
+  VERSION = "2.26.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.1
+  version: 2.26.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord