brick 1.0.246 → 1.0.248

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3410ae5fca9b12aa31007df9d3fac95a39f09eee58f4ffc2089bada97bde7793
-  data.tar.gz: 0da56c9311d8dd0ce2fd3a05039a6f85ca9910c64b303c25fc26f8d65fab512b
+  metadata.gz: ea1b54ee47db7637a4122bccb3fdcb613550aae57632bc6ce590851307085da2
+  data.tar.gz: 1f80b6c273b32df62b8b00f1251c9eea3322ecfd8cc308472cce4dbfecb85866
 SHA512:
-  metadata.gz: 7a2e821dfee25a5df265caf5700e25003cbc7cab88e439102fc949f5dfbba2f9f7b73803c98068d373ffbf12cab27dac3859c76a7772ea19bbaf4ffdbfbddbe6
-  data.tar.gz: 701d6d9e7d374cbe850806ce732f5b765c1ea3d051c111f316bcd29fdf45622d8999c04fa89ca058f13052670f56c77350fde24e00139ef40dc892b0c97ca896
+  metadata.gz: abb49248dc4466a54f892210db594acd481fe0292a21077fdc32e566855aabeca634b8ad5f9a4bef1d52c05e2aa798a4d24002f046e80bd285c19042db637d7e
+  data.tar.gz: a40eb65cfbd88e69e9b6dff165fbc4e83251b002cd445da9ad6a229841138311197fca25e22733c19e3ece186ecfbca882a35b7d64984ceaa3782571c65b181d

data/lib/brick/compatibility.rb

@@ -119,7 +119,7 @@ if Object.const_defined?('ActionPack') && !ActionPack.respond_to?(:version)
     end
   end
 end
-if Object.const_defined?('Bundler') && Bundler.locked_gems&.dependencies.key?('action_view')
+if Object.const_defined?('Bundler') && Bundler.locked_gems&.dependencies&.key?('action_view')
   require 'action_view' # Needed for Rails <= 4.0
   module ::ActionView
     if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)

data/lib/brick/extensions.rb

@@ -38,6 +38,8 @@
 
 # Upon creation of a new object, when going to the index page, highlight this new object and scroll it into view (likely to the very bottom of everything, although might be sorted differently)
 
+# If there is a module defined with the same name as a schema found in a Postgres, MSSQL, or Oracle database then missing models that should exist underneath that module are not auto-generated.
+
 # ==========================================================
 # Dynamically create model or controller classes when needed
 # ==========================================================
@@ -105,13 +107,41 @@ module ActiveRecord
         col_names = columns_hash.keys
         # If it's a composite primary key then allow all the values through
         # TODO: Should disallow any autoincrement / SERIAL columns
-        if skip_id && (pk_as_array = _pk_as_array).length == 1
-          col_names -= _pk_as_array
+        if skip_id && (pk_as_array = _pk_as_array).length == 1 &&
+           [:string, :text].exclude?(columns_hash[pk_as_array.first]&.type)
+          col_names -= pk_as_array
         end
         hoa, hma, rtans = _activestorage_actiontext_fields
         col_names.map(&:to_sym) + hoa + hma.map { |as| { as => [] } } + rtans.values
       end
 
+      def _brick_set_wheres(params, join_array = nil)
+        is_distinct = nil
+        wheres = {}
+        params.each do |k, v|
+          k = k.to_s # Rails < 4.2 comes in as a symbol
+          next unless k.start_with?('__')
+
+          k = k[2..-1] # Take off leading "__"
+          if (where_col = (ks = k.split('.')).last)[-1] == '!'
+            where_col = where_col[0..-2]
+          end
+          case ks.length
+          when 1
+            next unless self.column_names.any?(where_col) || self._brick_get_fks.include?(where_col)
+          when 2
+            assoc_name = ks.first.to_sym
+            # Make sure it's a good association name and that the model has that column name
+            next unless self.reflect_on_association(assoc_name)&.klass&.column_names&.any?(where_col)
+
+            join_array&.[]=(assoc_name, nil) # Store this relation name in our special collection for .joins()
+            is_distinct = true
+          end
+          wheres[k] = v.is_a?(String) ? v.split(',') : v
+        end
+        [wheres, is_distinct]
+      end
+
       # Return three lists of fields for this model --
       # has_one_attached, has_many_attached, and has_rich_text
       def _activestorage_actiontext_fields
@@ -185,7 +215,7 @@ module ActiveRecord
       end
 
       def is_postgres
-        @is_postgres ||= connection.adapter_name == 'PostgreSQL'
+        @is_postgres ||= ['PostgreSQL', 'PostGIS'].include?(connection.adapter_name)
       end
       def is_mysql
         @is_mysql ||= ['Mysql2', 'Trilogy'].include?(connection.adapter_name)
@@ -219,10 +249,17 @@ module ActiveRecord
         else
           # If there's no DSL yet specified, just try to find the first usable column on this model
           dsl = if table_exists?
-                  skip_columns = _brick_get_fks + (::Brick.config.metadata_columns || []) + [primary_key]
-                  if (descrip_col = columns.find { |c| c.type == :string && skip_columns.exclude?(c.name) })
+                  skip_columns = _brick_get_fks + (::Brick.config.metadata_columns || [])
+                  column_list = columns.dup
+                  pk_idx = column_list.index { |c| c.name == primary_key }
+                  if pk_idx
+                    pk_column = column_list.delete_at(pk_idx)
+                    # if the PK column is a string, put it at the end so it will get chosen as a last resort
+                    column_list << pk_column if [:string, :text].include?(columns_hash[primary_key]&.type)
+                  end
+                  if (descrip_col = column_list.find { |c| c.type == :string && skip_columns.exclude?(c.name) })
                     "[#{descrip_col.name}]"
-                  elsif (descrip_col = columns.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
+                  elsif (descrip_col = column_list.find { |c| [:boolean, :binary, :xml].exclude?(c.type) && skip_columns.exclude?(c.name) })
                     "[#{descrip_col.name}]"
                   else
                     "#{name} ##{_pk_as_array.map { |pk_part| "[#{pk_part}]" }.join(', ')}"
@@ -689,32 +726,10 @@ module ActiveRecord
       # model early in case the user wants to do an ORDER BY based on any of that.
       model._brick_calculate_bts_hms(translations, join_array) if is_add_bts || is_add_hms
 
-      is_distinct = nil
-      wheres = {}
       params = params.to_unsafe_h unless params.is_a?(Hash)
       params.merge!(args[1]) if args[1]
-      params.each do |k, v|
-        k = k.to_s # Rails < 4.2 comes in as a symbol
-        next unless k.start_with?('__')
-
-        k = k[2..-1] # Take off leading "__"
-        if (where_col = (ks = k.split('.')).last)[-1] == '!'
-          where_col = where_col[0..-2]
-        end
-        case ks.length
-        when 1
-          next unless klass.column_names.any?(where_col) || klass._brick_get_fks.include?(where_col)
-        when 2
-          assoc_name = ks.first.to_sym
-          # Make sure it's a good association name and that the model has that column name
-          next unless klass.reflect_on_association(assoc_name)&.klass&.column_names&.any?(where_col)
-
-          join_array[assoc_name] = nil # Store this relation name in our special collection for .joins()
-          is_distinct = true
-          distinct!
-        end
-        wheres[k] = v.is_a?(String) ? v.split(',') : v
-      end
+      wheres, is_distinct = klass._brick_set_wheres(params, join_array)
+      distinct! if is_distinct
 
       # %%% Skip the metadata columns
       if selects.empty? # Default to all columns
@@ -1756,7 +1771,7 @@ class Object
       end
       full_name = if relation || schema_name.blank?
                     if singular_table_name != table_name.singularize && # %%% Try this with http://localhost:3000/brick/spree/property_translations
-                       (schema_module = ::Brick.config.table_name_prefixes.find { |k, v| table_name.start_with?(k) }&.last&.constantize)
+                       (schema_module = ::Brick.config.table_name_prefixes.find { |k, v| table_name.length > k&.length && table_name.start_with?(k) }&.last&.constantize)
                       "#{schema_module&.name}::#{inheritable_name || model_name}"
                     else
                       inheritable_name || model_name
@@ -1775,7 +1790,7 @@ class Object
                 ::Brick.config.exclude_tables.include?(matching)
 
       # Are they trying to use a pluralised class name such as "Employees" instead of "Employee"?
-      if table_name == singular_table_name && !ActiveSupport::Inflector.inflections.uncountable.include?(table_name)
+      if table_name == singular_table_name && model_name.pluralize == model_name && !ActiveSupport::Inflector.inflections.uncountable.include?(table_name)
         # unless ::Brick.config.sti_namespace_prefixes&.key?("::#{singular_table_name.camelize}::")
         #   puts "Warning: Class name for a model that references table \"#{matching
         #        }\" should be \"#{ActiveSupport::Inflector.singularize(inheritable_name || model_name)}\"."
@@ -2193,7 +2208,7 @@ class Object
       end
       table_name = model&.table_name || ActiveSupport::Inflector.underscore(plural_class_name)
       pk = model&._brick_primary_key(relations.fetch(table_name, nil))
-      is_postgres = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      is_postgres = ['PostgreSQL', 'PostGIS'].include?(ActiveRecord::Base.connection.adapter_name)
       is_mysql = ['Mysql2', 'Trilogy'].include?(ActiveRecord::Base.connection.adapter_name)
 
       namespace = nil if namespace == ::Object
@@ -2475,10 +2490,19 @@ class Object
 
             real_model = model.find_real_model(params)
 
+            # %%% Allow params to define which columns to use for order_by
+            # Overriding the default by providing a querystring param?
+            order_by = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
+
             if request.format == :csv # Asking for a template?
               require 'csv'
               exported_csv = CSV.generate(force_quotes: false) do |csv_out|
-                real_model.df_export(true, real_model.brick_import_template, false, wheres, order_by).each do |row|
+                export_args = [true, real_model.brick_import_template, false]
+                if real_model.method(:df_export).parameters.length > 3
+                  wheres, _is_distinct = real_model._brick_set_wheres(params)
+                  export_args += [wheres, order_by]
+                end
+                real_model.df_export(*export_args).each do |row|
                   row.each do |d|
                     row.each_with_index do |d, idx|
                       # "false" disallows HTML encoding the descriptions of binary content
@@ -2499,11 +2523,6 @@ class Object
             end
 
             # Normal (not swagger or CSV) request
-
-            # %%% Allow params to define which columns to use for order_by
-            # Overriding the default by providing a querystring param?
-            order_by = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
-
             ar_relation = ActiveRecord.version < Gem::Version.new('4') ? real_model.preload : real_model.all
             params['_brick_is_api'] = true if (is_api = request.format == :js || current_api_root)
             @_brick_params = ar_relation._brick_querying((selects ||= []), params: params, order_by: order_by,
@@ -2696,7 +2715,14 @@ class Object
               render json: { result: es_result }
             else
               real_model, real_singular_table_name = model.real_singular(params)
-              created_obj = model.send(:new, send(params_name_sym))
+              # If there are any foreign keys that are strings and we've received a blank value, set that to nil
+              internal_params = (ac_params = send(params_name_sym))&.send(:parameters)
+              real_model.reflect_on_all_associations.each do |a|
+                if a.belongs_to? && internal_params.key?(fk_name = a.foreign_key.to_s) && [:string, :text].include?((fk_col = real_model.columns_hash[fk_name])&.type)
+                  internal_params[fk_name] = nil if internal_params[fk_name].blank?
+                end
+              end
+              created_obj = model.send(:new, ac_params)
               if created_obj.respond_to?(inh_col = model.inheritance_column) && created_obj.send(inh_col) == ''
                 created_obj.send("#{inh_col}=", model.name)
               end
@@ -2846,14 +2872,14 @@ class Object
           code << "  def #{params_name}\n"
           require_txt = model.base_class.name.underscore.tr('/', '_')
           is_for_expects = ::ActiveSupport.version >= ::Gem::Version.new('8.0a')
-          permits_txt = model._brick_find_permits(model, permits = model._brick_all_fields(true), is_for_expects)
+          permits = model._brick_find_permits(model, model._brick_all_fields(true), is_for_expects)
           if is_for_expects
-            code << "    params.expect(#{require_txt}: #{permits_txt})\n"
+            code << "    params.expect(#{require_txt}: #{permits})\n"
             self.define_method(params_name) do
               params.expect({ model.base_class.name.underscore.tr('/', '_').to_sym => permits })
             end
           else
-            code << "    params.require(:#{require_txt}).permit(#{permits_txt.map(&:inspect).join(', ')})\n"
+            code << "    params.require(:#{require_txt}).permit(#{permits.map(&:inspect).join(', ')})\n"
             self.define_method(params_name) do
               params.require(model.base_class.name.underscore.tr('/', '_').to_sym).permit(permits)
             end

data/lib/brick/rails/engine.rb

@@ -828,13 +828,13 @@ window.addEventListener(\"popstate\", linkSchemas);
               end
               css = +"
 <%
-          if @_request.respond_to?(:content_security_policy) && (csp = @_request.content_security_policy)&.directives&.present?
+          if @_request.respond_to?(:content_security_policy) && (csp = @_request.content_security_policy)&.directives&.present? %><%
             @_request.env['_is_brick'] = true
             if @_request.respond_to?(:content_security_policy_nonce_directives)
               @_request.content_security_policy_nonce_directives = %w[ script-src ]
               @_request.env['_brick_nonce'] = \" nonce=\\\"#\{@_request.content_security_policy_nonce}\\\"\".html_safe
               %><meta name=\"csp-nonce\" content=\"<%= @_request.content_security_policy_nonce %>\"><%
-            end
+            end %><%
             if !@_request.respond_to?(:_brick_content_security_policy)
               if csp.instance_variables.exclude?(:@_brick_style_shas)
                 csp.instance_variable_set(:@_brick_style_shas, [
@@ -950,7 +950,10 @@ if (window.brickFontFamily) {
                        when 'index'
                          if Object.const_defined?('DutyFree')
                            template_link = "
-  <%= link_to 'CSV', #{@_brick_model._brick_index}_path(format: :csv) %> &nbsp; <a href=\"#\" id=\"sheetsLink\">Sheets</a>
+  <%= csv_path = #{@_brick_model._brick_index}_path(format: :csv)
+      where_params = params.to_unsafe_h.each_with_object([]) { |v, s| s << \"#\{v.first}=#\{v[1]}\" if v.first.start_with?('__') }.join('&')
+      csv_path << \"?#\{where_params}\" unless where_params.blank?
+      link_to 'CSV', csv_path %> &nbsp; <a href=\"#\" id=\"sheetsLink\">Sheets</a>
   <div id=\"dropper\" contenteditable=\"true\"></div>
   <input type=\"button\" id=\"btnImport\" value=\"Import\">
 
@@ -1039,7 +1042,7 @@ if (window.brickFontFamily) {
   }
 </script>
 <script src=\"https://apis.google.com/js/api.js\"></script>
-<script async defer src=\"https://accounts.google.com/gsi/client\" id=\"gapiScript\"<%= @_request.env['_brick_nonce'] %>></script>
+<script async defer src=\"https://accounts.google.com/gsi/client\" id=\"gapiScript\"></script>
 <script<%= @_request.env['_brick_nonce'] %>>
   document.getElementById(\"gapiScript\").addEventListener(\"onload\",
     function () { // gapiLoaded
@@ -1072,14 +1075,16 @@ if (window.brickFontFamily) {
 </head>
 <body>
 <div id=\"titleBox\"><div id=\"titleSticky\">
-<% if request.respond_to?(:flash)
-     if (alert)
-%><p class=\"flashAlert\"><%= alert.html_safe %></p><%
-     end
-     if (notice)
-%><p class=\"flashNotice\"><%= notice.html_safe %></p><%
-     end
-end %>#{"
+<%= if request.respond_to?(:flash)
+      out = +''
+      if (alert)
+        out << \"<p class=\\\"flashAlert\\\">#\{alert}</p>\"
+      end
+      if (notice)
+        out << \"<p class=\\\"flashNotice\\\">#\{notice}</p>\"
+      end
+      out.html_safe
+    end %>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><tr>
@@ -1111,22 +1116,22 @@ end
    if description.present? %><span class=\"__brick\"><%=
      description %></span><br><%
    end
-   # FILTER PARAMETERS
+   # FILTER PARAMETERS %><%
    if @_brick_params&.present? %>
-  <% if @_brick_params.length == 1 # %%% Does not yet work with composite keys
+  <% if @_brick_params.length == 1 # %%% Does not yet work with composite keys %><%
        k, id = @_brick_params.first
        id = id.first if id.is_a?(Array) && id.length == 1
-       origin = (key_parts = k.split('.')).length == 1 ? model : model.reflect_on_association(key_parts.first).klass
+       origin = (key_parts = k.split('.')).length == 1 ? model : model.reflect_on_association(key_parts.first).klass %><%
        if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| fk[:fk] == key_parts.last }) &&
-          (objs = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id))
+          (objs = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id)) %><%
          objs = [objs] unless objs.is_a?(Array) %>
          <h3 class=\"__brick\">for <% objs.each do |obj| %><%=
                       link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination._brick_index(:singular)\}_path\".to_sym, id)
                %><% end %></h3><%
-       end
+       end %><%
      end %>
   <span class=\"__brick\">(<%= link_to \"See all #\{model.base_class.name.split('::').last.pluralize}\", #{@_brick_model._brick_index}_path %>)</span>
-<% end
+<% end %><%
    # COLUMN EXCLUSIONS
    if @_brick_excl&.present? %>
   <div id=\"exclusions\">Excluded columns:
@@ -1141,9 +1146,10 @@ end
       });
     });
   </script>
-<% end
+<% end %><%
    # SEARCH BOX
-   if @_brick_es && @_brick_es&.index('r') # Must have at least Elasticsearch Read access %>
+   if @_brick_es && @_brick_es&.index('r') # Must have at least Elasticsearch Read access
+%>
   <input type=\"text\" id=\"esSearch\" class=\"dimmed\">
   <script<%= @_request.env['_brick_nonce'] %>>
     var esSearch = document.getElementById(\"esSearch\");
@@ -1208,7 +1214,7 @@ end
 </div></div>
 #{::Brick::Rails.erd_markup(@_brick_model, prefix) if @_brick_model}
 
-<%= # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
+<%=#  Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
     # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
     @#{res_name} ||= if (dym_list = instance_variables.reject do |entry|
                              entry.to_s.start_with?('@_') ||
@@ -1340,21 +1346,21 @@ end
            ' class=\"orphan\"' unless ::Brick.relations.key?(r[1])
          else
            ' class=\"dimmed\"'
-         end&.html_safe %>><%= # Table
+         end&.html_safe %>><%=# Table
          if (rowcount = rel&.fetch(:rowcount, nil))
            rowcount = (rowcount > 0 ? \" (#\{rowcount})\" : nil)
          end
          \"#\{r[1]}#\{rowcount}\" %></td>
   <td<%= lines = r[2]&.map { |line| \"#\{line.first}:#\{line.last}\" }
-         ' class=\"dimmed\"'.html_safe unless r[2] %>><%= # Migration
+         ' class=\"dimmed\"'.html_safe unless r[2] %>><%=# Migration
           lines&.join('<br>')&.html_safe %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[3] %>><%= # Model
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[3] %>><%=# Model
           r[3] %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[4] %>><%= # Route
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[4] %>><%=# Route
                %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[5] %>><%= # Controller
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[5] %>><%=# Controller
                %></td>
-  <td<%= ' class=\"dimmed\"'.html_safe unless r[6] %>><%= # Views
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[6] %>><%=# Views
                %></td>
   </tr>
 <% end %>
@@ -1369,14 +1375,14 @@ end
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <h1>Orphans<%= \" for #\{}\" if false %></h1>
-<% @orphans.each do |o|
-     if (klass = ::Brick.relations[o[0]]&.fetch(:class_name, nil)&.constantize) %>
-<%=    via = \" (via #\{o[4]})\" unless \"#\{o[2].split('.').last.underscore.singularize}_id\" == o[4]
+<%= @orphans.each_with_object(+'') do |o, s|
+      if (klass = ::Brick.relations[o[0]]&.fetch(:class_name, nil)&.constantize)
+s << \"    via = \\\" (via #\{o[4]})\\\" unless \"#\{o[2].split('.').last.underscore.singularize}_id\" == o[4]
        link_to(\"#\{o[0]} #\{o[1]} refers#\{via} to non-existent #\{o[2]} #\{o[3]}#\{\" (in table \\\"#\{o[5]}\\\")\" if o[5]}\",
-               send(\"#\{klass._brick_index(:singular)\}_path\".to_sym, o[1])) %>
-  <br>
-<%   end
-   end %>
+               send(\"#\{klass._brick_index(:singular)\}_path\".to_sym, o[1]))
+s << \"\\n  <br>\\n\"
+     end
+   end.html_safe %>
 #{script}"
                          end
 
@@ -1416,25 +1422,27 @@ end
   c23.141-70.188,89.141-120.906,167.063-120.906c97.25,0,176,78.813,176,176C511.828,227.078,404.391,119.641,271.844,119.641z\" />
 </svg>
 
-<% if request.respond_to?(:flash)
-     if (alert)
-%><p class=\"flashAlert\"><%= alert.html_safe %></p><%
-     end
-     if (notice)
-%><p class=\"flashNotice\"><%= notice.html_safe %></p><%
-     end
-end %>#{"
+<%= if request.respond_to?(:flash)
+      out = +''
+      if (alert)
+        out << \"<p class=\\\"flashAlert\\\">#\{alert}</p>\"
+      end
+      if (notice)
+        out << \"<p class=\\\"flashNotice\\\">#\{notice}</p>\"
+      end
+      out.html_safe
+    end %>#{"
 #{schema_options}" if schema_options}
 <select id=\"tbl\">#{table_options}</select>
 <table id=\"resourceName\"><tr><td><h1><%= page_title %></h1></td>
-<% rel = Brick.relations[#{model_name}.table_name]
+<%= rel = Brick.relations[#{model_name}.table_name]
    if (in_app = rel.fetch(:existing, nil)&.fetch(:show, nil))
      begin
-       in_app = send(\"#\{in_app}_path\", #{pk.is_a?(String) ? "obj.#{pk}" : '[' + pk.map { |pk_part| "obj.#{pk_part}" }.join(', ') + ']' }) if in_app.is_a?(Symbol) %>
-     <td><%= link_to(::Brick::Rails::IN_APP.html_safe, in_app) %></td>
-<%   rescue ActionController::UrlGenerationError
+       in_app = send(\"#\{in_app}_path\", #{pk.is_a?(String) ? "obj.#{pk}" : '[' + pk.map { |pk_part| "obj.#{pk_part}" }.join(', ') + ']' }) if in_app.is_a?(Symbol)
+       \"\\n     <td>#\{link_to(::Brick::Rails::IN_APP.html_safe, in_app)}</td>\\n\".html_safe
+     rescue ActionController::UrlGenerationError
      end
-   end
+   end %><%
 
    if Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) %>
   <td><%= link_to_brick(
@@ -1445,19 +1453,19 @@ end %>#{"
                    end,
         title: \"#\{page_title} in Avo\" }
     ) %></td>
-<% end
+<% end %><%=
 
    if Object.const_defined?('ActiveAdmin')
-     ActiveAdmin.application.namespaces.names.each do |ns| %>
-<td><%= link_to_brick(
-   ::Brick::Rails::AA_PNG.html_safe,
-   { show_proc: Proc.new do |aa_model, relation|
-                  path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{aa_model.model_name.singular_route_key}_path\".to_sym
-                  send(path_helper, obj) if respond_to?(path_helper)
-                end,
-     title: \"#\{page_title} in ActiveAdmin\" }
- ) %></td>
-<%   end
+     ActiveAdmin.application.namespaces.names.each_with_object(+'') do |ns, s|
+       s << \"\\n<td>#\{link_to_brick(
+         ::Brick::Rails::AA_PNG.html_safe,
+         { show_proc: Proc.new do |aa_model, relation|
+                         path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{aa_model.model_name.singular_route_key}_path\".to_sym
+                         send(path_helper, obj) if respond_to?(path_helper)
+                       end,
+           title: \"#\{page_title} in ActiveAdmin\" }
+         )}</td>\\n\"
+     end
    end %>
 </tr></table>
 <%
@@ -1466,21 +1474,11 @@ if (description = rel&.fetch(:description, nil)) %>
 end
 %><%= link_to \"(See all #\{model_name.pluralize})\", see_all_path, { class: '__brick' } %>
 #{::Brick::Rails.erd_markup(@_brick_model, prefix) if @_brick_model}
-<% if obj
-     # path_options = [obj.#{pk}]
-     # path_options << { '_brick_schema':  } if
-     options = {}
-     options[:url] = if obj.new_record?
-                       link_to_brick(obj.class, path_only: true) # Properly supports STI, but only works for :new
-                     else
-                       path_helper = obj.new_record? ? #{model_name}._brick_index : #{model_name}._brick_index(:singular)
-                       options[:url] = send(\"#\{path_helper}_path\".to_sym, obj) if ::Brick.config.path_prefix || (path_helper != obj.class.table_name)
-                     end
-%>
+<% if obj %>
   <br><br>
 
-<%= # Write out the mega-form
-    brick_form_for(obj, options, #{model_name}, bts, #{pk.inspect}) %>
+<%=# Write out the mega-form
+    brick_form_with(model: obj, bts: bts, pk: #{pk.inspect}) %>
 
 #{unless args.first == 'new'
   # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: \"Delete #\{model_name} -- Are you sure?\" }" : "form: { data: { turbo_confirm: \"Delete #\{model_name} -- Are you sure?\" } }"
@@ -1713,7 +1711,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
               end
               if representation == :grid
                 inline << "<script<%= @_request.env['_brick_nonce'] %>>
-<% # Make column headers sort when clicked
+<%#  Make column headers sort when clicked
    # %%% Create a smart javascript routine which can do this client-side %>
 [... document.getElementsByTagName(\"TH\")].forEach(function (th) {
   th.addEventListener(\"click\", function (e) {

data/lib/brick/rails/form_builder.rb

@@ -9,18 +9,19 @@ module Brick::Rails::FormBuilder
   def brick_field(method, html_options = {}, val = nil, col = nil,
                   bt = nil, bt_class = nil, bt_name = nil, bt_pair = nil)
     model = self.object.class
-    col ||= model.columns_hash[method]
+    col ||= model.columns_hash[method.to_s]
     out = +'<table><tr><td>'
     html_options[:class] = 'dimmed' unless val
     is_revert = true
     template = instance_variable_get(:@template)
+    method_sym = method.to_sym
     if bt
       bt_class ||= bt[1].first.first
       bt_name ||= bt[1].map { |x| x.first.name }.join('/')
       bt_pair ||= bt[1].first
 
       html_options[:prompt] = "Select #{bt_name}"
-      out << self.select(method.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options)
+      out << self.select(method_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options)
       bt_obj = nil
       begin
         bt_obj = bt_class&.find_by(bt_pair[1] => val)
@@ -38,8 +39,8 @@ module Brick::Rails::FormBuilder
                   "<span class=\"orphan\">Orphaned ID: #{val}</span>".html_safe
                 end
       out << bt_link if bt_link
-    elsif model._brick_monetized_attributes&.include?(method)
-      out << self.text_field(method.to_sym, html_options.merge({ value: Money.new(val.to_i).format }))
+    elsif model._brick_monetized_attributes&.include?(method.to_s)
+      out << self.text_field(method_sym, html_options.merge({ value: Money.new(val.to_i).format }))
     else
       col_type = if model.json_column?(col) || val.is_a?(Array)
                    :json
@@ -61,40 +62,40 @@ module Brick::Rails::FormBuilder
             out << "<img src=\"#{url}\" title=\"#{val}\">"
           elsif model.respond_to?(:enumerized_attributes) && (opts = (attr = model.enumerized_attributes[method])&.options).present?
             enum_html_options = attr.kind_of?(Enumerize::Multiple) ? html_options.merge({ multiple: true, size: opts.length + 1 }) : html_options
-            out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, enum_html_options)
+            out << self.select(method_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, enum_html_options)
           else
             spit_out_text_field = true
           end
         elsif col_type == :enum
           if col.respond_to?(:limit) && col.limit.present?
-            out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + col.limit, { value: val.to_s || '^^^brick_NULL^^^' }, html_options)
+            out << self.select(method_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + col.limit, { value: val.to_s || '^^^brick_NULL^^^' }, html_options)
           else
             spit_out_text_field = true
           end
         else
           template.instance_variable_set(:@_text_fields_present, true)
-          out << self.hidden_field(method.to_sym, html_options)
+          out << self.hidden_field(method_sym, html_options)
           out << "<trix-editor input=\"#{self.field_id(method)}\"></trix-editor>"
         end
         if spit_out_text_field
           # %%% Need to update the max-width with javascript when page width is adjusted?
           html_options.merge!(style: 'min-width: 154px;field-sizing: content;') # max-width: auto;
-          out << self.text_field(method.to_sym, html_options)
+          out << self.text_field(method_sym, html_options)
         end
         when :boolean
-        out << self.check_box(method.to_sym)
+        out << self.check_box(method_sym)
       when :integer, :decimal, :float
-        if model.respond_to?(:attribute_types) && (enum_type = model.attribute_types[method]).is_a?(ActiveRecord::Enum::EnumType)
+        if model.respond_to?(:attribute_types) && (enum_type = model.attribute_types[method.to_s]).is_a?(ActiveRecord::Enum::EnumType)
           opts = enum_type.send(:mapping)&.each_with_object([]) { |v, s| s << [v.first, v.first] } || []
-          out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, options)
+          out << self.select(method_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, options)
         else
           digit_pattern = col_type == :integer ? '(?:-|)\d*' : '(?:-|)\d*(?:\.\d*|)'
-          # Used to do this for float / decimal:  self.number_field method.to_sym
-          out << self.text_field(method.to_sym, { pattern: digit_pattern, class: 'check-validity' })
+          # Used to do this for float / decimal:  self.number_field method_sym
+          out << self.text_field(method_sym, { pattern: digit_pattern, class: 'check-validity' })
         end
       when *DT_PICKERS.keys
         template.instance_variable_set(:@_date_fields_present, true)
-        out << self.text_field(method.to_sym, { class: DT_PICKERS[col_type] })
+        out << self.text_field(method_sym, { class: DT_PICKERS[col_type] })
       when :uuid
         is_revert = false
         # Postgres naturally uses the +uuid_generate_v4()+ function from the uuid-ossp extension
@@ -146,7 +147,7 @@ module Brick::Rails::FormBuilder
         end
         out << self.hidden_field("_brick_attached_#{method}", value: existing.join(',')) unless existing.blank?
         # Render a "Choose File(s)" input element
-        args = [method.to_sym]
+        args = [method_sym]
         args << { multiple: true } if col&.type == :files
         out << self.file_field(*args)
       when :primary_key
@@ -163,7 +164,7 @@ module Brick::Rails::FormBuilder
         end
         # Because there are so danged many quotes in JSON, escape them specially by converting to backticks.
         # (and previous to this, escape backticks with our own goofy code of ^^br_btick__ )
-        out << (json_field = self.hidden_field(method.to_sym, { class: 'jsonpicker', value: val_str&.gsub('`', '^^br_btick__')&.tr('\"', '`')&.html_safe }))
+        out << (json_field = self.hidden_field(method_sym, { class: 'jsonpicker', value: val_str&.gsub('`', '^^br_btick__')&.tr('\"', '`')&.html_safe }))
         out << "<div id=\"_br_json_#{self.field_id(method)}\"></div>"
       else
         is_revert = false
@@ -177,6 +178,7 @@ module Brick::Rails::FormBuilder
     end
     out << "</td></tr></table>
 "
+    @_brick&.fetch(:fields_rendered, nil)&.<< method.to_s # Track that we've rendered this one
     out.html_safe
   end # brick_field
 end