brick 1.0.213 → 1.0.214

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02a0436d0c71a40e1aa3858e4fdf20822f32b02864e621964bce288b8b21ad60
-  data.tar.gz: 8257218e3c1e9c26842753590e627802842c67dec93891aec7139fd2f31d67c0
+  metadata.gz: afed5350a655b7eca570609ff4d15f998ecfe746345c4771b7eb910274df14ae
+  data.tar.gz: 45d5cccb07240fe0995bf812dc4b0cc34d21edd1bb0ab3cf212cd255c8a0f6a4
 SHA512:
-  metadata.gz: 222b736da74b699a1f352ffff9f087f39048fceaf995dc28733823b4d38271c0bc04ecba506fb6fd027a7f39883009baede3d9c70f81a46dc023f692d6c831e4
-  data.tar.gz: bdee88e65dad07aa66b6ce9458a44ba8d1ad069b937d5bceae65f020162107336b6d7619aee03ed4c56c25a3e38b4c17ce0352677883426802dfe28ac3c8567a
+  metadata.gz: ca420002527953167f6ba1112e43d197bea259bf360c89ff92a01c9753c53da1b7060c15cd021c27e6106c4e77e7d3c30f589c89509ae21c2a2fe69d42e6f079
+  data.tar.gz: e6b1fd3745b5c69bfaa9486a4158b7a8efc03c7c43aa884a13f630e9b023e40e0893e1862e6e7fee545049efb46c5b3686cd4f05363d19eb3dfcf0d8f6b1cef3

data/lib/brick/config.rb

@@ -429,19 +429,6 @@ module Brick
       end
     end
 
-    def acts_as_list_cols
-      @mutex.synchronize { @acts_as_list || {} }
-    end
-
-    # Get something like:
-    #   { 'on_call_list' => { _brick_default: [:last_name, :first_name] } }
-    #   { 'on_call_list' => { _brick_default: :sequence } }
-    def acts_as_list_cols=(position_cols)
-      @mutex.synchronize do
-        @acts_as_list ||= position_cols
-      end
-    end
-
     def metadata_columns
       @mutex.synchronize { @metadata_columns ||= ['created_at', 'updated_at', 'deleted_at'] }
     end

data/lib/brick/extensions.rb

@@ -71,15 +71,24 @@ module ActiveRecord
       end
 
       def real_model(params)
-        if params && (sub_model = params.fetch(type_col = inheritance_column, nil))
-          sub_model = sub_model.first if sub_model.is_a?(Array) # Support the params style that gets returned from #_brick_querying
+        if params && ((sub_name = params.fetch(inheritance_column, nil)).present? ||
+                      (sub_name = params[name.underscore]&.fetch(inheritance_column, nil)))
+          sub_name = sub_name.first if sub_name.is_a?(Array) # Support the params style that gets returned from #_brick_querying
           # Make sure the chosen model is really the same or a subclass of this model
-          (possible_model = sub_model.constantize) <= self ? possible_model : self
+          return self if sub_name.blank?
+
+          (possible_model = sub_name.constantize) <= self ? possible_model : self
         else
           self
         end
       end
 
+      # Accommodate STI
+      def real_singular(params)
+        real_model = real_model(params)
+        [real_model, real_model.name.underscore.split('/').last]
+      end
+
       def json_column?(col)
         col.type == :json || ::Brick.config.json_columns[table_name]&.include?(col.name) ||
         (
@@ -196,33 +205,6 @@ module ActiveRecord
       def _brick_monetized_attributes
         @_brick_monetized_attributes ||= respond_to?(:monetized_attributes) ? monetized_attributes.values : {}
       end
-
-      # def acts_as_list(aal_cols = nil)
-      #   if aal_cols
-      #     aal_cols = [aal_cols] unless aal_cols.is_a?(Array)
-      #     @acts_as_list_cols = aal_cols.each_with_object([]) do |aal_col, s|
-      #       if column_names.include?(aal_col = aal_col.to_s) && !s.include?(aal_col)
-      #         s << aal_col
-      #       end
-      #     end
-      #   else
-      #     if [:integer, :bigint].include?(columns_hash['position']&.type)
-      #       @acts_as_list_cols = ['position']
-      #     else
-      #       return
-      #     end
-      #   end
-      #   # Override save in order to update neighbours when necessary
-      #   alias _brick_save save
-      #   def save
-      #     # @acts_as_list_cols
-      #     # -1
-      #     @acts_as_list_cols.each do |aal_col|
-      #       binding.pry if (aal_change = changes[aal_col])
-      #     end
-      #     _brick_save
-      #   end
-      # end
     end
 
     def self.brick_parse_dsl(join_array = nil, prefix = [], translations = {}, is_polymorphic = false, dsl = nil, emit_dsl = false)
@@ -1765,7 +1747,9 @@ class Object
         end
         # Accommodate singular or camel-cased table names such as "order_detail" or "OrderDetails"
         code << "  self.table_name = '#{self.table_name = matching}'\n" if (inheritable_name || model_name).underscore.pluralize != matching
-        if (inh_col = ::Brick.config.sti_type_column.find { |_k, v| v.include?(matching) }&.first)
+
+        if (inh_col = relation.fetch(:sti_col, nil) ||
+                      ::Brick.config.sti_type_column.find { |_k, v| v.include?(matching) }&.first)
           new_model_class.inheritance_column = inh_col
           code << "  self.inheritance_column = '#{inh_col}'\n"
         end
@@ -1816,11 +1800,6 @@ class Object
           end
         end
 
-        if (sti_col = relation.fetch(:sti_col, nil))
-          new_model_class.send(:'inheritance_column=', sti_col)
-          code << "  self.inheritance_column = #{sti_col.inspect}\n"
-        end
-
         unless is_sti
           fks = relation[:fks] || {}
           # Do the bulk of the has_many / belongs_to processing, and store details about HMT so they can be done at the very last
@@ -1902,12 +1881,6 @@ class Object
           end
         end
 
-        # Apply any acts_as_list things
-        if (aal_col = ::Brick.config.acts_as_list_cols.fetch(matching, nil))
-          new_model_class.send(:acts_as_list, aal_col.to_sym)
-          code << "  acts_as_list :#{aal_col}\n"
-        end
-
         # Auto-support Ransack if it's present
         if self.respond_to?(:ransackable_attributes)
           def self.ransackable_attributes(auth_object = nil)
@@ -2480,13 +2453,15 @@ class Object
           code << "    @#{plural_table_name}._brick_querying(params, brick_col_names: true)\n"
           code << "  end\n"
 
-          is_pk_string = nil
+          # ----------------------------------------------------------------------------------
+
           if pk.present?
             code << "  def show\n"
             code << "    #{find_by_name = "find_#{singular_table_name}"}\n"
             code << "  end\n"
             self.define_method :show do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
+              _, singular_table_name = model.real_singular(params)
               instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
               add_csp_hash("'unsafe-inline'")
             end
@@ -2505,7 +2480,8 @@ class Object
                            send(params_name_sym)
                          rescue
                          end
-            new_params ||= model.attribute_names.each_with_object({}) do |a, s|
+            real_model, singular_table_name = model.real_singular(params)
+            new_params ||= real_model.attribute_names.each_with_object({}) do |a, s|
               if (val = params["__#{a}"])
                 # val = case new_obj.class.column_for_attribute(a).type
                 #       when :datetime, :date, :time, :timestamp
@@ -2516,7 +2492,7 @@ class Object
                 s[a] = val
               end
             end
-            if (new_obj = model.new(new_params)).respond_to?(:serializable_hash)
+            if (new_obj = real_model.new(new_params)).respond_to?(:serializable_hash)
               # Convert any Filename objects with nil into an empty string so that #encode can be called on them
               new_obj.serializable_hash.each do |k, v|
                 new_obj.send("#{k}=", ::ActiveStorage::Filename.new('')) if v.is_a?(::ActiveStorage::Filename) && !v.instance_variable_get(:@filename)
@@ -2542,12 +2518,20 @@ class Object
               end
               render json: { result: ::Brick.unexclude_column(table_name, col) }
             else
-              created_obj = model.send(:create, send(params_name_sym))
-              @_lookup_context.instance_variable_set(:@_brick_model, model)
+              real_model = model.real_model(params)
+              singular_table_name = real_model.name.underscore.split('/').last
+              created_obj = model.send(:new, send(params_name_sym))
+              if created_obj.respond_to?(inh_col = model.inheritance_column) && created_obj.send(inh_col) == ''
+                created_obj.send("#{inh_col}=", model.name)
+              end
+              created_obj.save
+              @_lookup_context.instance_variable_set(:@_brick_model, real_model)
               if created_obj.errors.empty?
+                instance_variable_set("@#{singular_table_name}".to_sym, created_obj)
                 index
                 render :index
               else # Surface errors to the user in a flash message
+                instance_variable_set("@#{singular_table_name}".to_sym, created_obj)
                 flash.now.alert = (created_obj.errors.errors.map { |err| "<b>#{err.attribute}</b> #{err.message}" }.join(', '))
                 new
                 render :new
@@ -2566,6 +2550,7 @@ class Object
             code << "  end\n"
             self.define_method :edit do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
+              _, singular_table_name = model.real_singular(params)
               instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
               add_csp_hash
             end
@@ -2593,6 +2578,7 @@ class Object
               #   return
               end
 
+              _, singular_table_name = model.real_singular(params)
               instance_variable_set("@#{singular_table_name}".to_sym, (obj = find_obj))
               upd_params = send(params_name_sym)
               json_overrides = ::Brick.config.json_columns&.fetch(table_name, nil)
@@ -2679,11 +2665,11 @@ class Object
           if is_need_params
             code << "  def #{params_name}\n"
             permits_txt = model._brick_find_permits(model, permits = model._brick_all_fields(true))
-            code << "    params.require(:#{require_name = model.name.underscore.tr('/', '_')
+            code << "    params.require(:#{model.base_class.name.underscore.tr('/', '_')
                              }).permit(#{permits_txt.map(&:inspect).join(', ')})\n"
             code << "  end\n"
             self.define_method(params_name) do
-              params.require(require_name.to_sym).permit(permits)
+              params.require(model.base_class.name.underscore.tr('/', '_').to_sym).permit(permits)
             end
             private params_name
             # Get column names for params from relations[model.table_name][:cols].keys
@@ -2978,7 +2964,8 @@ module Brick
       else
         inverse_table = [primary_table] if polymorphic_class
         assoc_bt = bts[cnstr_name] = { is_bt: true, fk: fk[2], assoc_name: bt_assoc_name, inverse_table: inverse_table || primary_table }
-        assoc_bt[:optional] = true if is_optional
+        assoc_bt[:optional] = true if is_optional ||
+                                      (is_optional.nil? && !relations[fk[1]][:cols][fk[2]][3])
         assoc_bt[:polymorphic] = [polymorphic_class] if polymorphic_class
       end
       if is_class

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

@@ -809,6 +809,7 @@ h1, h3 {
   background-repeat: no-repeat;
   background-size: 100% 100%;
   width: 28px;
+  height: 32px;
   cursor: pointer;
 }
 #mermaidErd {
@@ -942,10 +943,10 @@ table.shadow > tbody > tr {
 table tbody tr:nth-of-type(even) {
   background-color: #f3f3f3;
 }
-table tbody tr:nth-of-type(even) .col-sticky {
+table tbody tr:nth-of-type(even) .alternating-gray {
   background-color: #fff;
 }
-table tbody tr:nth-of-type(odd) .col-sticky {
+table tbody tr:nth-of-type(odd) .alternating-gray {
   background-color: #f3f3f3;
 }
 
@@ -991,6 +992,11 @@ a.big-arrow {
   background-color: red;
   color: white;
 }
+.brick-note {
+  font-size: 0.7em;
+  color: #A0FFA0;
+  max-width: 0;
+}
 
 #revertTemplate {
   display: none;
@@ -1336,8 +1342,7 @@ end
       end}
  %>
 
-#{"<hr><%= link_to(\"New #{new_path_name = "new_#{path_obj_name}_path"
-                           obj_name}\", #{new_path_name}, { class: '__brick' }) if respond_to?(:#{new_path_name}) %>" unless @_brick_model.is_view?}
+#{"<hr><%= link_to_brick(model, new: true, class: '__brick') %>" unless @_brick_model.is_view?}
 #{script}
 </body>
 </html>
@@ -1437,7 +1442,7 @@ end
 <head>
 #{css}
 <title><%=
-  base_model = (model = (obj = @#{obj_name})&.class).base_class
+  base_model = (model = (obj = @#{obj_name}).class).base_class
   see_all_path = send(\"#\{base_model._brick_index}_path\")
 #{(inh_col = @_brick_model.inheritance_column).present? &&
 "  if obj.respond_to?(:#{inh_col}) && (model_name = @#{obj_name}.#{inh_col}) &&
@@ -1445,6 +1450,7 @@ end
     see_all_path << \"?#{inh_col}=#\{model_name}\"
   end
   model_name = base_model.name if model_name.is_a?(Numeric)"}
+  model_name = nil if model_name == ''
   page_title = (\"#\{model_name ||= model.name}: #\{obj&.brick_descrip || controller_name}\")
 %></title>
 </head>
@@ -1510,8 +1516,12 @@ end
      # path_options = [obj.#{pk}]
      # path_options << { '_brick_schema':  } if
      options = {}
-     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)
+     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
 %>
   <br><br>
 

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

@@ -6,70 +6,20 @@ module Brick::Rails::FormTags
     # When a relation is not provided, first see if one exists which matches the controller name or
     # something has turned up in the instance variables.
     relation ||= (instance_variable_get("@#{controller_name}".to_sym) || _brick_resource_from_iv)
+    klass = relation.klass
 
     nfc = Brick.config.sidescroll.fetch(relation.table_name, nil)&.fetch(:num_frozen_columns, nil) ||
           Brick.config.sidescroll.fetch(:num_frozen_columns, nil) ||
           0
 
-    # HTML for brick_grid
-    out = +"<div id=\"headerTopContainer\"><table id=\"headerTop\"></table>
-"
-    klass = relation.klass
+    out = +''
     rel = ::Brick.relations&.fetch(relation.table_name, nil)
-    unless show_header == false
-      out << "  <div id=\"headerTopAddNew\">
-    <div id=\"headerButtonBox\">
-"
-      unless show_row_count == false
-        out << "      <div id=\"rowCount\"></div>
-"
-      end
-      unless show_erd_button == false
-        out << "      <div id=\"imgErd\" title=\"Show ERD\"></div>
-"
-      end
-      if rel && show_in_app_button != false && (in_app = rel.fetch(:existing, nil)&.fetch(:index, nil))
-        begin
-          in_app = send("#{in_app}_path") if in_app.is_a?(Symbol)
-          out << "      <td title=\"Show in app\">#{link_to(::Brick::Rails::IN_APP.html_safe, in_app)}</td>
-"
-        rescue ActionController::UrlGenerationError # Avoid snags like "No route matches {:action=>"index", :controller=>"categories/products"}, missing required keys: [:category_id]"
-        end
-      end
-      if show_avo_button != false && Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) && klass.name.exclude?('::')
-        out << "
-        <td>#{link_to_brick(
-            ::Brick::Rails::AVO_SVG.html_safe,
-            { index_proc: Proc.new do |_avo_model, relation|
-                            path_helper = "resources_#{relation.fetch(:auto_prefixed_schema, nil)}#{klass.model_name.route_key}_path".to_sym
-                            ::Avo.railtie_routes_url_helpers.send(path_helper) if ::Avo.railtie_routes_url_helpers.respond_to?(path_helper)
-                          end,
-              title: "#{klass.name} in Avo" }
-        )}</td>
-"
-      end
-
-      if show_aa_button != false && Object.const_defined?('ActiveAdmin')
-        ActiveAdmin.application.namespaces.names.each do |ns|
-          out << "
-        <td>#{link_to_brick(
-            ::Brick::Rails::AA_PNG.html_safe,
-            { index_proc: Proc.new do |aa_model, relation|
-                            path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{aa_model.model_name.route_key}_path".to_sym
-                            send(path_helper) if respond_to?(path_helper)
-                          end,
-              title: "#{klass.name} in ActiveAdmin" }
-        )}</td>
-"
-        end
-      end
-    out << "    </div>
-  </div>
-"
+    if show_header != false
+      out << brick_header(rel, klass, show_row_count, show_erd_button, show_in_app_button, show_avo_button, show_aa_button)
     end
 
-    out << "</div>
-<table id=\"#{table_name = relation.table_name.split('.').last}\" class=\"shadow\"#{ " x-num-frozen=\"#{nfc}\"" if nfc.positive? }>
+    # HTML for brick_grid
+    out << "<table id=\"#{table_name = relation.table_name.split('.').last}\" class=\"shadow\"#{ " x-num-frozen=\"#{nfc}\"" if nfc.positive? }>
   <thead><tr>"
     pk = klass.primary_key || []
     pk = [pk] unless pk.is_a?(Array)
@@ -145,13 +95,13 @@ module Brick::Rails::FormTags
     row_count = 0
     relation.each do |obj|
       out << "<tr>\n"
-      out << "<td class=\"col-sticky\">#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym,
+      out << "<td class=\"col-sticky alternating-gray\">#{link_to('⇛', send("#{klass._brick_index(:singular)}_path".to_sym,
                                       pk.map { |pk_part| obj.send(pk_part.to_sym) }), { class: 'big-arrow' })}</td>\n" if pk.present?
       sequence.each_with_index do |col_name, idx|
         val = obj.attributes[col_name]
         bt = bts[col_name] || composite_bt_names[col_name]
         out << '<td'
-        (classes ||= []) << 'col-sticky' if idx < nfc
+        (classes ||= []) << 'col-sticky alternating-gray' if idx < nfc
         (classes ||= []) << 'dimmed' unless cols.key?(col_name) || (cust_col = cust_cols[col_name]) ||
                                             (col_name.is_a?(Symbol) && bts.key?(col_name)) # HOT
         (classes ||= []) << 'right' if val.is_a?(Numeric) && !bt
@@ -255,161 +205,14 @@ module Brick::Rails::FormTags
       out << '</tr>'
       row_count += 1
     end
-    if rel && (total_row_count = rel.fetch(:rowcount, nil))
-      total_row_count = total_row_count > row_count ? " (out of #{total_row_count})" : nil
-    end
     out << "  </tbody>
 </table>
-<script>
-  var rowCount = document.getElementById(\"rowCount\");
-  if (rowCount) rowCount.innerHTML = \"#{pluralize(row_count, "row")}#{total_row_count} &nbsp;\";
-</script>
-"
-
-    # Javascript for brick_grid
-    (@_brick_javascripts ||= {})[:grid_scripts] = "
-var #{table_name}HtColumns;
-
-// Snag first TR for sticky header
-var grid = document.getElementById(\"#{table_name}\");
-#{table_name}HtColumns = grid && [grid.getElementsByTagName(\"TR\")[0]];
-var headerTop = document.getElementById(\"headerTop\");
-var headerCols;
-if (grid) {
-  // COLUMN HEADER AND TABLE CELL HIGHLIGHTING
-  var gridHighHeader = null,
-      gridHighCell = null;
-  grid.addEventListener(\"mouseenter\", gridMove);
-  grid.addEventListener(\"mousemove\", gridMove);
-  grid.addEventListener(\"mouseleave\", function (evt) {
-    if (gridHighCell) gridHighCell.classList.remove(\"highlight\");
-    gridHighCell = null;
-    if (gridHighHeader) gridHighHeader.classList.remove(\"highlight\");
-    gridHighHeader = null;
-  });
-  function gridMove(evt) {
-    var lastHighCell = gridHighCell;
-    gridHighCell = document.elementFromPoint(evt.x, evt.y);
-    while (gridHighCell && gridHighCell.tagName !== \"TD\" && gridHighCell.tagName !== \"TH\")
-      gridHighCell = gridHighCell.parentElement;
-    if (gridHighCell) {
-      if (lastHighCell !== gridHighCell) {
-        gridHighCell.classList.add(\"highlight\");
-        if (lastHighCell) lastHighCell.classList.remove(\"highlight\");
-      }
-      var lastHighHeader = gridHighHeader;
-      if ((gridHighHeader = headerCols[gridHighCell.cellIndex]) && lastHighHeader !== gridHighHeader) {
-        if (gridHighHeader) gridHighHeader.classList.add(\"highlight\");
-        if (lastHighHeader) lastHighHeader.classList.remove(\"highlight\");
-      }
-    }
-  }
-  // // LESS TOUCHY NAVIGATION BACK OR FORWARD IN HISTORY WHEN USING MOUSE WHEEL
-  // grid.addEventListener(\"wheel\", function (evt) {
-  //   grid.scrollLeft += evt.deltaX;
-  //   document.body.scrollTop += (evt.deltaY * 0.6);
-  //   evt.preventDefault();
-  //   return false;
-  // });
-}
-function setHeaderSizes() {
-  if (grid.clientWidth > window.outerWidth)
-    document.getElementById(\"titleBox\").style.width = grid.clientWidth;
-  // console.log(\"start\");
-  // See if the headerTop is already populated
-  // %%% Grab the TRs from headerTop, clear it out, do this stuff, add them back
-  headerTop.innerHTML = \"\"; // %%% Would love to not have to clear it out like this every time!  (Currently doing this to support resize events.)
-  var isEmpty = headerTop.childElementCount === 0;
-  var numFixed = parseInt(grid.getAttribute(\"x-num-frozen\")) || 0;
-  var fixedColLefts = [0];
-
-  // Set up proper sizings of sticky column header
-  var node;
-  for (var j = 0; j < #{table_name}HtColumns.length; ++j) {
-    var row = #{table_name}HtColumns[j];
-    var tr = isEmpty ? document.createElement(\"TR\") : headerTop.childNodes[j];
-    tr.innerHTML = row.innerHTML.trim();
-    var curLeft = 0.0;
-    // Match up widths from the original column headers
-    for (var i = 0; i < row.childNodes.length; ++i) {
-      node = row.childNodes[i];
-      if (node.nodeType === 1) {
-        var th = tr.childNodes[i];
-        th.style.minWidth = th.style.maxWidth = getComputedStyle(node).width;
-        // Add \"left: __px\" style to the fixed-width column THs
-        if (i <= numFixed) {
-          th.style.position = \"sticky\";
-          th.style.backgroundColor = \"#008061\";
-          th.style.zIndex = \"1\";
-          th.style.left = curLeft + \"px\";
-          fixedColLefts.push(curLeft += node.clientWidth);
-        }
-        if (#{pk&.present? ? 'i > 0' : 'true'}) {
-          // Add <span> at the end
-          var span = document.createElement(\"SPAN\");
-          span.className = \"exclude\";
-          span.innerHTML = \"X\";
-          span.addEventListener(\"click\", function (e) {
-            e.stopPropagation();
-            doFetch(\"POST\", {_brick_exclude: this.parentElement.getAttribute(\"x-order\")});
-          });
-          th.appendChild(span);
-        }
-      }
-    }
-    headerCols = tr.childNodes;
-    if (isEmpty) headerTop.appendChild(tr);
-  }
-  // Add \"left: __px\" style to all fixed-width column TDs
-  [...grid.children[1].children].forEach(function (row) {
-    for (var j = 1; j <= numFixed; ++j) {
-      row.children[j].style.left = fixedColLefts[j] + 'px';
-    }
-  });
-  grid.style.marginTop = \"-\" + getComputedStyle(headerTop).height;
-  // console.log(\"end\");
-}
-
-if (headerTop) {
-  onImagesLoaded(function() {
-    setHeaderSizes();
-  });
-  window.addEventListener(\"resize\", function(event) {
-    setHeaderSizes();
-  }, true);#{
-if !klass.is_view? && respond_to?(new_path_name = "new_#{klass._brick_index(:singular)}_path")
-  "
-var headerButtonBox = document.getElementById(\"headerButtonBox\");
-if (headerButtonBox) {
-  var addNew = document.createElement(\"A\");
-  addNew.id = \"addNew\";
-  addNew.href = \"#{send(new_path_name)}\";
-  addNew.title = \"New #{table_name.singularize}\";
-  addNew.innerHTML = '<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"><path fill=\"#fff\" d=\"M24 10h-10v-10h-4v10h-10v4h10v10h4v-10h10z\"/></svg>';
-  headerButtonBox.append(addNew);
-}
-"
-end}
-}
-
-function onImagesLoaded(event) {
-  var images = document.getElementsByTagName(\"IMG\");
-  var numLoaded = images.length;
-  for (var i = 0; i < images.length; ++i) {
-    if (images[i].complete)
-      --numLoaded;
-    else {
-      images[i].addEventListener(\"load\", function() {
-        if (--numLoaded <= 0)
-          event();
-      });
-    }
-  }
-  if (numLoaded <= 0)
-    event();
-}
 "
+    if rel && (total_row_count = rel.fetch(:rowcount, nil))
+      total_row_count = total_row_count > row_count ? " (out of #{total_row_count})" : nil
+    end
 
+    set_grid_javascript(klass, pk, show_new_button, row_count, total_row_count)
     out.html_safe
   end # brick_grid
 
@@ -418,7 +221,7 @@ function onImagesLoaded(event) {
   def brick_form_for(obj, options = {}, model = obj.class, bts = {}, pk = (obj.class.primary_key || []))
     pk = [pk] unless pk.is_a?(Array)
     pk.map!(&:to_s)
-    form_for(obj.becomes(model), options) do |f|
+    form_for(obj.becomes(model.base_class), options) do |f|
       out = +'<table class="shadow">'
       has_fields = false
       # If it's a new record, set any default polymorphic types
@@ -525,28 +328,37 @@ function onImagesLoaded(event) {
 
   # ------------------------------------------
   # Our cool N:M checkbox constellation editor
-  def brick_constellation(relation = nil, options = {}, x_axis: nil, y_axis: nil, bt_descrip: nil, bts: {})
+  def brick_constellation(relation = nil, options = {}, x_axis: nil, y_axis: nil, bt_descrip: nil, bts: {},
+                          show_header: nil, show_erd_button: nil, show_in_app_button: nil, show_new_button: nil, show_avo_button: nil, show_aa_button: nil)
+    relation ||= (instance_variable_get("@#{controller_name}".to_sym) || _brick_resource_from_iv)
+    klass = relation.klass
     x_axis, x_list, y_axis, y_list, existing = _n_m_prep(relation, x_axis, y_axis)
 
+    out = +''
+    rel = ::Brick.relations&.fetch(relation.table_name, nil)
+    if show_header != false
+      out << brick_header(rel, klass, false, show_erd_button, show_in_app_button, show_avo_button, show_aa_button)
+    end
+
     # HTML for constellation
     prefix = options[:prefix]
-    out = +"<form action=\"#{"#{prefix}/" if prefix}brick_constellation\">
+    out << "<form action=\"#{"#{prefix}/" if prefix}brick_constellation\">
 <table id=\"#{table_name = relation.table_name.split('.').last}\" class=\"shadow\">
-  <thead><tr><td></td>
-"
+  <thead><tr><td class=\"brick-note\">Checkbox changes are saved immediately</td>"
     # Header row with X axis values
+    # (In order for grid highlighting to function, these TH elements must have no whitespace between them.
+    # In this way the Javascript headerCols array will be set properly.
     x_list.each do |x_item|
-      out << "    <th>#{x_item.first}</th>
-"
+      out << "<th>#{x_item.first}</th>"
     end
-    out << "  </tr></thead>
+    out << "</tr></thead>
   <tbody>
 "
-    obj_path = "#{relation.klass._brick_index(:singular)}_path".to_sym
+    obj_path = "#{klass._brick_index(:singular)}_path".to_sym
     link_arrow = link_to('⇛', send(obj_path, '____'), { class: 'big-arrow' })
-    pk_as_array = relation.klass._pk_as_array
+    pk_as_array = klass._pk_as_array
     y_list.each do |y_item|
-      out << "  <tr><th>#{y_item.first}</th>
+      out << "  <tr><th class=\"col-sticky\">#{y_item.first}</th>
 "
       x_list.each do |x_item|
         checked = existing.find { |e| e[1] == x_item.last && e[2] == y_item.last }
@@ -570,7 +382,7 @@ function onImagesLoaded(event) {
       _this = this;
       if (this.checked) {
         var ids = this.value.split(\"_\");
-        doFetch(\"POST\", {modelName: \"#{relation.klass.name}\",
+        doFetch(\"POST\", {modelName: \"#{klass.name}\",
                            args: [#{x_axis[1].inspect}, ids[0], #{y_axis[1].inspect}, ids[1]],
                            _brick_action: \"/#{prefix}brick_associate\"},
           function (p) { // If it returns successfully, create an <a> element
@@ -586,7 +398,7 @@ function onImagesLoaded(event) {
           }
         );
       } else if (nextSib = this.nextElementSibling) {
-        doFetch(\"DELETE\", {modelName: \"#{relation.klass.name}\",
+        doFetch(\"DELETE\", {modelName: \"#{klass.name}\",
                 id: this.getAttribute(\"x-id\"),
                 _brick_action: \"/#{prefix}brick_associate\"},
           function (p) { // If it returns successfully, remove the an <a> element
@@ -599,6 +411,7 @@ function onImagesLoaded(event) {
 </script>
 </form>
 "
+    set_grid_javascript(klass, pk_as_array, false)
     out.html_safe
   end # brick_constellation
 
@@ -606,7 +419,9 @@ function onImagesLoaded(event) {
   # Our cool N:M bezier visualisation
   # (...... work in progress .......)
   def brick_bezier(relation = nil, options = {}, x_axis: nil, y_axis: nil, bt_descrip: nil, bts: {})
+    relation ||= (instance_variable_get("@#{controller_name}".to_sym) || _brick_resource_from_iv)
     x_axis, x_list, y_axis, y_list, existing = _n_m_prep(relation, x_axis, y_axis)
+    rel = ::Brick.relations&.fetch(relation.table_name, nil)
     # HTML for constellation
     # X axis (List on left side)
     out = +"<table id=\"#{x_axis.first}\" class=\"shadow\">
@@ -629,13 +444,222 @@ function onImagesLoaded(event) {
     out.html_safe
   end # brick_bezier
 
+  # ---------------------------------------------------------------------------------------------------------
+  def brick_header(rel, klass, show_row_count, show_erd_button, show_in_app_button, show_avo_button, show_aa_button)
+    out = +"<div id=\"headerTopContainer\"><table id=\"headerTop\"></table>
+  <div id=\"headerTopAddNew\">
+    <div id=\"headerButtonBox\">
+"
+    unless show_row_count == false
+      out << "      <div id=\"rowCount\"></div>
+"
+    end
+    unless show_erd_button == false
+      out << "      <div id=\"imgErd\" title=\"Show ERD\"></div>
+"
+    end
+    if rel && show_in_app_button != false && (in_app = rel.fetch(:existing, nil)&.fetch(:index, nil))
+      begin
+        in_app = send("#{in_app}_path") if in_app.is_a?(Symbol)
+        out << "      <td title=\"Show in app\">#{link_to(::Brick::Rails::IN_APP.html_safe, in_app)}</td>
+"
+      rescue ActionController::UrlGenerationError # Avoid snags like "No route matches {:action=>"index", :controller=>"categories/products"}, missing required keys: [:category_id]"
+      end
+    end
+    if show_avo_button != false && Object.const_defined?('Avo') && ::Avo.respond_to?(:railtie_namespace) && klass.name.exclude?('::')
+      out << "
+        <td>#{link_to_brick(
+            ::Brick::Rails::AVO_SVG.html_safe,
+            { index_proc: Proc.new do |_avo_model, relation|
+                            path_helper = "resources_#{relation.fetch(:auto_prefixed_schema, nil)}#{klass.model_name.route_key}_path".to_sym
+                            ::Avo.railtie_routes_url_helpers.send(path_helper) if ::Avo.railtie_routes_url_helpers.respond_to?(path_helper)
+                          end,
+              title: "#{klass.name} in Avo" }
+        )}</td>
+"
+    end
+
+    if show_aa_button != false && Object.const_defined?('ActiveAdmin')
+      ActiveAdmin.application.namespaces.names.each do |ns|
+        out << "
+        <td>#{link_to_brick(
+            ::Brick::Rails::AA_PNG.html_safe,
+            { index_proc: Proc.new do |aa_model, relation|
+                            path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{aa_model.model_name.route_key}_path".to_sym
+                            send(path_helper) if respond_to?(path_helper)
+                          end,
+              title: "#{rel[:class_name]} in ActiveAdmin" }
+        )}</td>
+"
+      end
+    end
+    out << "    </div>
+  </div>
+</div>
+"
+    out
+  end # brick_header
+
+  # -----------------------------------------------------------------------------------------------
+  def set_grid_javascript(klass, pk, show_new_button = nil, row_count = nil, total_row_count = nil)
+    table_name = klass.table_name.split('.').last
+
+    # Javascript for brick_grid and brick_constellation
+    grid_scripts = (@_brick_javascripts ||= {})[:grid_scripts] = +''
+
+    grid_scripts << "
+// Plunk the row count in now that we know it
+var rowCount = document.getElementById(\"rowCount\");
+if (rowCount) rowCount.innerHTML = \"#{pluralize(row_count, "row")}#{total_row_count} &nbsp;\";
+var #{table_name}HtColumns;
+" unless row_count.nil?
+
+    grid_scripts << "
+// Snag first TR for sticky header
+var grid = document.getElementById(\"#{table_name}\");
+#{table_name}HtColumns = grid && [grid.getElementsByTagName(\"TR\")[0]];
+var headerTop = document.getElementById(\"headerTop\");
+var headerCols;
+if (grid) {
+  // COLUMN HEADER AND TABLE CELL HIGHLIGHTING
+  var gridHighHeader = null,
+      gridHighCell = null;
+  grid.addEventListener(\"mouseenter\", gridMove);
+  grid.addEventListener(\"mousemove\", gridMove);
+  grid.addEventListener(\"mouseleave\", function (evt) {
+    if (gridHighCell) gridHighCell.classList.remove(\"highlight\");
+    gridHighCell = null;
+    if (gridHighHeader) gridHighHeader.classList.remove(\"highlight\");
+    gridHighHeader = null;
+  });
+  function gridMove(evt) {
+    var lastHighCell = gridHighCell;
+    gridHighCell = document.elementFromPoint(evt.x, evt.y);
+    while (gridHighCell && gridHighCell.tagName !== \"TD\" && gridHighCell.tagName !== \"TH\")
+      gridHighCell = gridHighCell.parentElement;
+    if (gridHighCell) {
+      if (lastHighCell !== gridHighCell) {
+        gridHighCell.classList.add(\"highlight\");
+        if (lastHighCell) lastHighCell.classList.remove(\"highlight\");
+      }
+      var lastHighHeader = gridHighHeader;
+      if ((gridHighHeader = headerCols[gridHighCell.cellIndex]) && lastHighHeader !== gridHighHeader) {
+        if (gridHighHeader) gridHighHeader.classList.add(\"highlight\");
+        if (lastHighHeader) lastHighHeader.classList.remove(\"highlight\");
+      }
+    }
+  }
+  // // Less touchy navigation back or forward in history when using mouse wheel
+  // grid.addEventListener(\"wheel\", function (evt) {
+  //   grid.scrollLeft += evt.deltaX;
+  //   document.body.scrollTop += (evt.deltaY * 0.6);
+  //   evt.preventDefault();
+  //   return false;
+  // });
+}
+function setHeaderSizes() {
+  if (grid.clientWidth > window.outerWidth)
+    document.getElementById(\"titleBox\").style.width = grid.clientWidth;
+  // console.log(\"start\");
+  // See if the headerTop is already populated
+  // %%% Grab the TRs from headerTop, clear it out, do this stuff, add them back
+  headerTop.innerHTML = \"\"; // %%% Would love to not have to clear it out like this every time!  (Currently doing this to support resize events.)
+  var isEmpty = headerTop.childElementCount === 0;
+  var numFixed = parseInt(grid.getAttribute(\"x-num-frozen\")) || 0;
+  var fixedColLefts = [0];
+
+  // Set up proper sizings of sticky column header
+  var node;
+  for (var j = 0; j < #{table_name}HtColumns.length; ++j) {
+    var row = #{table_name}HtColumns[j];
+    var tr = isEmpty ? document.createElement(\"TR\") : headerTop.childNodes[j];
+    tr.innerHTML = row.innerHTML.trim();
+    var curLeft = 0.0;
+    // Match up widths from the original column headers
+    for (var i = 0; i < row.childNodes.length; ++i) {
+      node = row.childNodes[i];
+      if (node.nodeType === 1) {
+        var th = tr.childNodes[i];
+        th.style.minWidth = th.style.maxWidth = getComputedStyle(node).width;
+        // Add \"left: __px\" style to the fixed-width column THs
+        if (i <= numFixed) {
+          th.style.position = \"sticky\";
+          th.style.backgroundColor = \"#008061\";
+          th.style.zIndex = \"1\";
+          th.style.left = curLeft + \"px\";
+          fixedColLefts.push(curLeft += node.clientWidth);
+        }
+        if (#{pk&.present? ? 'i > 0' : 'true'}) {
+          // Add <span> at the end
+          var span = document.createElement(\"SPAN\");
+          span.className = \"exclude\";
+          span.innerHTML = \"X\";
+          span.addEventListener(\"click\", function (e) {
+            e.stopPropagation();
+            doFetch(\"POST\", {_brick_exclude: this.parentElement.getAttribute(\"x-order\")});
+          });
+          th.appendChild(span);
+        }
+      }
+    }
+    headerCols = tr.childNodes;
+    if (isEmpty) headerTop.appendChild(tr);
+  }
+  // Add \"left: __px\" style to all fixed-width column TDs
+  [...grid.children[1].children].forEach(function (row) {
+    for (var j = 1; j <= numFixed; ++j) {
+      row.children[j].style.left = fixedColLefts[j] + 'px';
+    }
+  });
+  grid.style.marginTop = \"-\" + getComputedStyle(headerTop).height;
+  // console.log(\"end\");
+}
+
+if (headerTop) {
+  onImagesLoaded(function() {
+    setHeaderSizes();
+  });
+  window.addEventListener(\"resize\", function(event) {
+    setHeaderSizes();
+  }, true);#{
+    "
+    var headerButtonBox = document.getElementById(\"headerButtonBox\");
+    if (headerButtonBox) {
+      var addNew = document.createElement(\"A\");
+      addNew.id = \"addNew\";
+      addNew.href = \"#{link_to_brick(klass, new: true, path_only: true)}\";
+      addNew.title = \"New #{table_name.singularize}\";
+      addNew.innerHTML = '<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"><path fill=\"#fff\" d=\"M24 10h-10v-10h-4v10h-10v4h10v10h4v-10h10z\"/></svg>';
+      headerButtonBox.append(addNew);
+    }
+" unless klass.is_view? || show_new_button == false
+  }
+}
+
+function onImagesLoaded(event) {
+  var images = document.getElementsByTagName(\"IMG\");
+  var numLoaded = images.length;
+  for (var i = 0; i < images.length; ++i) {
+    if (images[i].complete)
+      --numLoaded;
+    else {
+      images[i].addEventListener(\"load\", function() {
+        if (--numLoaded <= 0)
+          event();
+      });
+    }
+  }
+  if (numLoaded <= 0)
+    event();
+}
+"
+  end
+
+  # -------------------------------------
   def _n_m_prep(relation, x_axis, y_axis)
-    relation ||= (instance_variable_get("@#{controller_name}".to_sym) || _brick_resource_from_iv)
     # Just find the first two BT things at this point
 
     klass = relation.klass
-    rel = ::Brick.relations&.fetch(relation.table_name, nil)
-    # fk_assocs = rel[:fks].map { |k, fk| [fk[:assoc_name], fk[:fk]] }
     fk_assocs = klass.reflect_on_all_associations.each_with_object([]) do |assoc, s|
       s << [assoc.name.to_s, assoc.foreign_key, assoc.klass] if assoc.belongs_to?
     end
@@ -690,8 +714,10 @@ function onImagesLoaded(event) {
       kwargs[:visited] = {}
     end
 
-    text = ((args.first.is_a?(String) || args.first.is_a?(Proc)) && args.shift) || args[1]
-    text = text.call if text.is_a?(Proc)
+    unless (is_path_only = kwargs.delete(:path_only))
+      text = ((args.first.is_a?(String) || args.first.is_a?(Proc)) && args.shift) || args[1]
+      text = text.call if text.is_a?(Proc)
+    end
     klass_or_obj = ((args.first.is_a?(ActiveRecord::Relation) ||
                      args.first.is_a?(ActiveRecord::Base) ||
                      args.first.is_a?(Class)) &&
@@ -739,6 +765,8 @@ function onImagesLoaded(event) {
           filter_parts << "#{whr.first}=#{whr.last}" if whr.last && !whr.last.is_a?(Array)
         end
         klass_or_obj = klass_or_obj.klass
+      end
+      if klass_or_obj.is_a?(Class) && klass_or_obj <= ActiveRecord::Base
         type_col = klass_or_obj.inheritance_column
         if klass_or_obj.column_names.include?(type_col) && klass_or_obj.name != klass_or_obj.base_class.name
           filter_parts << "#{type_col}=#{klass_or_obj.name}"
@@ -750,11 +778,22 @@ function onImagesLoaded(event) {
       relation = ::Brick.relations.fetch(rel_name || klass.table_name, nil)
       if (klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base) ||
          (klass_or_obj&.is_a?(ActiveRecord::Base) && klass_or_obj.new_record? && (klass_or_obj = klass_or_obj.class))
-        path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/', relation, true), action: :index)}#{filter}"
-        lt_args = [text || "Index for #{klass_or_obj.name.pluralize}", path]
+        if kwargs.delete(:new)
+          path = (proc = kwargs[:new_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(:singular, '/', relation, true), action: :new)}#{filter}"
+          return path if is_path_only
+
+          lt_args = [text || "New #{klass_or_obj.name}", path]
+        else
+          path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/', relation, true), action: :index)}#{filter}"
+          return path if is_path_only
+
+          lt_args = [text || "Index for #{klass_or_obj.name.pluralize}", path]
+        end
       else
         # If there are multiple incoming parameters then last one is probably the actual ID, and first few might be some nested tree of stuff leading up to it
         path = (proc = kwargs[:show_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.class.base_class._brick_index(nil, '/', relation, true), action: :show, id: klass_or_obj)}#{filter}"
+        return path if is_path_only
+
         lt_args = [text || "Show this #{klass_or_obj.class.name}", path]
       end
       kwargs.delete(:visited)

data/lib/brick/reflect_tables.rb

@@ -341,7 +341,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
             fk[4].downcase! if fk[4] =~ /^[A-Z0-9_]+$/
             fk[2] = connection.send(:oracle_downcase, fk[2])
           end
-          ::Brick._add_bt_and_hm(fk, relations)
+          ::Brick._add_bt_and_hm(fk, relations, nil, nil)
         end
         kcus = nil # Allow this large item to be garbage collected
       end

data/lib/brick/version_number.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.213
+  version: 1.0.214
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-01 00:00:00.000000000 Z
+date: 2024-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord