brick 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b64e2d571540382ce5ecd497f1e1413fde20119d46f1b24e1fae5af428fb45
-  data.tar.gz: 1c26ccf7b8df54fd121546e8daeeb9508561328186af46aea8ba1bd819524532
+  metadata.gz: 0ad289d9f4db9ef6ce9edcfb8948926d4a61910294291272ccf2b342fa2f5051
+  data.tar.gz: 9030f9ccf39d7f0a9a0ff9413e4f24ee7a46beaf3aba056e9875fc5c29551419
 SHA512:
-  metadata.gz: e103d061b74402f3fe0b944d06b30c20f053166c706a54f15753afc8cb0c703ae71f83bd88191f985a37180cb9bdafdba918178174df08f58f683a723fcfb73a
-  data.tar.gz: 13a7dce7f4f5789a0d7a0c6cae4adcaf2f44d22d0f59c355d75102a7f08292d80c781f8d33be121801d375fd33fed8bcdf4ef6b56108ef8f4ab4110c1f49e296
+  metadata.gz: ed6f08eabba91cb304141a0c84884cfbeaae0087094b1fe1ff4a80195aee44dbb697c385ab9d7afaac2e337f9008bc7bef059be98f95264fec34a2288beaff6b
+  data.tar.gz: 5ebbb793d23634232a529b3d39224e1e4deaa010cf8bf2841effe20a9e3b4d7079fb7163e6c2f90feeed8526c4a1314f319bad47d1c8a6079bf54ca92f0e6224

data/lib/brick/config.rb

@@ -74,6 +74,20 @@ module Brick
       @mutex.synchronize { @exclude_hms = skips }
     end
 
+    # Skip showing counts for these specific has_many associations when building auto-generated #index views
+    def skip_index_hms
+      @mutex.synchronize { @skip_index_hms || {} }
+    end
+
+    def skip_index_hms=(skips)
+      @mutex.synchronize do
+        @skip_index_hms ||= skips.each_with_object({}) do |v, s|
+                              class_name, assoc_name = v.split('.')
+                              (s[class_name] ||= {})[assoc_name.to_sym] = nil
+                            end
+      end
+    end
+
     # Associations to treat as a has_one
     def has_ones
       @mutex.synchronize { @has_ones }

data/lib/brick/extensions.rb

@@ -304,7 +304,10 @@ module ActiveRecord
           # join_array[bt.first] = nil # Store this relation name in our special collection for .joins()
           bt_descrip[bt.first] = [bt.last, bt.last.brick_parse_dsl(join_array, bt.first, translations)]
         end
+        skip_klass_hms = ::Brick.config.skip_index_hms[klass.name] || {}
         hms.each do |k, hm|
+          next if skip_klass_hms.key?(k)
+
           join_array[k] = nil # Store this relation name in our special collection for .joins()
           hm_counts[k] = nil # Placeholder that will be filled in once we know the proper table alias
         end
@@ -672,7 +675,6 @@ class Object
           # %%% Add custom HM count columns
           # %%% What happens when the PK is composite?
           counts = hm_counts.each_with_object([]) { |v, s| s << "COUNT(DISTINCT #{v.last.first}.#{v.last.last.primary_key}) AS _br_#{v.first}_ct" }
-          puts counts.inspect
           # *selects, 
           instance_variable_set("@#{table_name}".to_sym, ar_relation.dup._select!(*selects, *counts))
           # binding.pry

data/lib/brick/frameworks/rails/engine.rb

@@ -74,6 +74,7 @@ module Brick
               table_name = model_name.pluralize.underscore
               bts, hms, associatives = ::Brick.get_bts_and_hms(@_brick_model) # This gets BT and HM and also has_many :through (HMT)
               hms_columns = +'' # Used for 'index'
+              skip_klass_hms = ::Brick.config.skip_index_hms[model_name] || {}
               hms_headers = hms.each_with_object([]) do |hm, s|
                 hm_assoc = hm.last
                 if args.first == 'index'
@@ -84,9 +85,15 @@ module Brick
                                  hm_assoc.foreign_key
                                end
                   hms_columns << if hm_assoc.macro == :has_many
+                    set_ct = if skip_klass_hms.key?((assoc_name = hm.first).to_sym)
+                               'nil'
+                             else
+                               "#{obj_name}._br_#{assoc_name}_ct"
+                             end
+
 "<td>
-  <%= ct = #{obj_name}._br_#{hm.first}_ct
-      link_to \"#\{ct\} #{hm.first}\", #{hm_assoc.klass.name.underscore.pluralize}_path({ #{hm_fk_name}: #{obj_name}.#{pk} }) unless ct.zero? %>
+  <%= ct = #{set_ct}
+      link_to \"#\{ct || 'View'\} #{assoc_name}\", #{hm_assoc.klass.name.underscore.pluralize}_path({ #{hm_fk_name}: #{obj_name}.#{pk} }) unless ct&.zero? %>
 </td>\n"
                                  else # has_one
 "<td>
@@ -177,10 +184,10 @@ def hide_bcrypt(val)
 end %>"
 
               if ['index', 'show', 'update'].include?(args.first)
-                # Example:  <% bts = { "site_id" => [:site, Site, "id"], "study_id" => [:study, Study, "id"], "study_country_id" => [:study_country, StudyCountry, "id"], "user_id" => [:user, User, "id"], "role_id" => [:role, Role, "id"] } %>
                 css << "<% bts = { #{bts.each_with_object([]) { |v, s| s << "#{v.first.inspect} => [#{v.last.first.inspect}, #{v.last[1].name}, #{v.last[1].primary_key.inspect}]"}.join(', ')} } %>"
               end
 
+              # %%% When doing schema select, if there's an ID then remove it, or if we're on a new page go to index
               script = "<script>
 var schemaSelect = document.getElementById(\"schema\");
 var brickSchema;

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 20
+    TINY = 21
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -103,10 +103,10 @@ module Brick
 
     def get_bts_and_hms(model)
       bts, hms = model.reflect_on_all_associations.each_with_object([{}, {}]) do |a, s|
-        # So that we can map an association name to any special alias name used in an AREL query
-        ans = (model._assoc_names[a.name] ||= [])
         next if !const_defined?(a.name.to_s.singularize.camelize) && ::Brick.config.exclude_tables.include?(a.plural_name)
 
+        # So that we can map an association name to any special alias name used in an AREL query
+        ans = (model._assoc_names[a.name] ||= [])
         ans << a.klass unless ans.include?(a.klass)
         case a.macro
         when :belongs_to
@@ -240,6 +240,12 @@ module Brick
       end
     end
 
+    # Skip showing counts for these specific has_many associations when building auto-generated #index views
+    # @api public
+    def skip_index_hms=(value)
+      Brick.config.skip_index_hms = value
+    end
+
     # Associations to treat as a has_one
     # @api public
     def has_ones=(hos)

data/lib/generators/brick/install_generator.rb

@@ -111,11 +111,16 @@ module Brick
 # # to be the primary key.)
 #{bar}
 
-# # Skip creating a has_many association for these
+# # Skip creating a has_many association for these (only retain the belongs_to built from this additional_reference).
 # # (Uses the same exact three-part format as would define an additional_reference)
 # # Say for instance that we didn't care to display the favourite colours that users have:
 # Brick.exclude_hms = [['users', 'favourite_colour_id', 'colours']]
 
+# # Skip showing counts for these specific has_many associations when building auto-generated #index views.
+# # When there are related tables with a significant number of records, this can lessen the load on the database
+# # considerably, sometimes fixing what might appear to be an index page that just \"hangs\" for no apparent reason.
+Brick.skip_index_hms = ['User.litany_of_woes']
+
 # # By default primary tables involved in a foreign key relationship will indicate a \"has_many\" relationship pointing
 # # back to the foreign table.  In order to represent a \"has_one\" association instead, an override can be provided
 # # using the primary model name and the association name which you instead want to have treated as a \"has_one\":

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord