brick 1.0.52 → 1.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3d0b398d1d3926fa3e59281c976fe2f7a54bfc16de4f99683928ce71d7ace97
-  data.tar.gz: 344c0de3e8691583e9a940ee451ad29015d46b0cbc55756d3b36e10d9ce27edb
+  metadata.gz: 737256fad5c987fa2ac603cf3708da959127a33ab9b27d164ceff858b71987b9
+  data.tar.gz: 144352db7686d19d9c330887069287da88de456276cc17aaeeaeb3c1de7a3281
 SHA512:
-  metadata.gz: e0cff4e30c30d33dd13bd5a6a4a888d52e0552fc692369c42a53846da00e9ce677ab48ba840ef1396728d339984e5f7ff35d9ce33ea60f8421b9fa19edc14575
-  data.tar.gz: 5971fcc802dd1732f71d3bcd015e4b616f7775028a10205c7e4b9b1fa41d13c0318f581c966c223e9a0661b8b9fa52e1197ae78c007144e93ec96de61b084663
+  metadata.gz: 83ec370e06c18bf9d62ec3ed445daf78dc5cbff825a85ff017cc7b814efb62f86e68022f7577734dd01ddf7e2f74b4b59de4b40b9c07656e83d0859ba6a4333d
+  data.tar.gz: 9106373ca7878dcc75c596f1fa44d420980c50cb09f5b63a1110d4e02dc63f02dafe3d1bc0d4de38a75d5678d964e3b8f12a720a722d2f593934e2f6be97f818

data/lib/brick/extensions.rb

@@ -1116,6 +1116,11 @@ class Object
           if namespace && (idx = lookup_context.prefixes.index(table_name))
             lookup_context.prefixes[idx] = "#{namespace.name.underscore}/#{lookup_context.prefixes[idx]}"
           end
+          @_brick_excl = session[:_brick_exclude]&.split(',')&.each_with_object([]) do |excl, s|
+                           if (excl_parts = excl.split('.')).first == table_name
+                             s << excl_parts.last
+                           end
+                         end
           @_brick_bt_descrip = model._br_bt_descrip
           @_brick_hm_counts = model._br_hm_counts
           @_brick_join_array = join_array
@@ -1156,8 +1161,20 @@ class Object
           code << "  end\n"
           self.define_method :create do
             ::Brick.set_db_schema(params)
-            instance_variable_set("@#{singular_table_name}".to_sym,
-                                  model.send(:create, send(params_name_sym)))
+            if (is_json = request.content_type == 'application/json') && (col = params['_brick_exclude'])
+              session[:_brick_exclude] = ((session[:_brick_exclude]&.split(',') || []) + ["#{table_name}.#{col}"]).join(',')
+              render json: { result: ::Brick.exclude_column(table_name, col) }
+            elsif is_json && (col = params['_brick_unexclude'])
+              if (excls = ((session[:_brick_exclude]&.split(',') || []) - ["#{table_name}.#{col}"]).join(',')).empty?
+                session.delete(:_brick_exclude)
+              else
+                session[:_brick_exclude] = excls
+              end
+              render json: { result: ::Brick.unexclude_column(table_name, col) }
+            else
+              instance_variable_set("@#{singular_table_name}".to_sym,
+                                    model.send(:create, send(params_name_sym)))
+            end
           end
 
           if pk_col

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

@@ -132,23 +132,24 @@ module Brick
                                end
                   case args.first
                   when 'index'
-                    hms_columns << if hm_assoc.macro == :has_many
-                                     if hm_fk_name
-                                       set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
-                                                   'nil'
-                                                 else
-                                                   # Postgres column names are limited to 63 characters
-                                                   attrib_name = "_br_#{assoc_name}_ct"[0..62]
-                                                   "#{obj_name}.#{attrib_name} || 0"
-                                                 end
-                                       "#{hm_assoc.name}: [#{assoc_name.inspect}, #{set_ct}, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}]"
-                                     else # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
-                                       "#{hm_assoc.name}: [#{assoc_name.inspect}]"
-                                     end
-                                   else # has_one
-                                     # 0..62 because Postgres column names are limited to 63 characters
-                                     "#{hm_assoc.name}: [#{assoc_name.inspect}, nil, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}]"
+                    hm_entry = +"'#{hm_assoc.name}' => [#{assoc_name.inspect}"
+                    hm_entry << if hm_assoc.macro == :has_many
+                                   if hm_fk_name # %%% Can remove this check when multiple foreign keys to same destination becomes bulletproof
+                                     set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
+                                                 'nil'
+                                               else
+                                                 # Postgres column names are limited to 63 characters
+                                                 "#{obj_name}.#{"_br_#{assoc_name}_ct"[0..62]} || 0"
+                                               end
+                                     ", #{set_ct}, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}"
                                    end
+                                 else # has_one
+                                   # 0..62 because Postgres column names are limited to 63 characters
+                                   ", nil, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}"
+                                 end
+                    hm_entry << ']'
+                    puts hm_entry
+                    hms_columns << hm_entry
                   when 'show', 'update'
                     hm_stuff << if hm_fk_name
                                   "<%= link_to '#{assoc_name}', #{hm_assoc.klass.name.underscore.tr('/', '_').pluralize}_path({ #{path_keys(hm_assoc, hm_fk_name, "@#{obj_name}", pk)} }) %>\n"
@@ -174,6 +175,9 @@ module Brick
                               end.html_safe
               table_options << '<option value="brick_orphans">(Orphans)</option>'.html_safe if is_orphans
               css = +"<style>
+h1, h3 {
+  margin-bottom: 0;
+}
 #dropper {
   background-color: #eee;
 }
@@ -195,19 +199,41 @@ table {
   box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
 }
 
-table thead tr th, table tr th {
+tr th {
   background-color: #009879;
   color: #fff;
   text-align: left;
 }
-#headerTop th:hover, #headerTop th:hover {
+#headerTop tr th {
+  position: relative;
+}
+#headerTop tr th .exclude {
+  position: absolute;
+  display: none;
+  top: 0;
+  right: 0;
+}
+#headerTop tr th:hover {
   background-color: #18B090;
 }
-table thead tr th a, table tr th a {
+#exclusions {
+  font-size: 0.7em;
+}
+#exclusions div {
+  border: 1px solid blue;
+  display: inline-block;
+  cursor: copy;
+}
+#headerTop tr th:hover .exclude {
+  display: inline;
+  cursor: pointer;
+  color: red;
+}
+tr th a {
   color: #80FFB8;
 }
 
-table th, table td {
+tr th, tr td {
   padding: 0.2em 0.5em;
 }
 
@@ -253,6 +279,7 @@ a.big-arrow {
 }
 .dimmed {
   background-color: #C0C0C0;
+  text-align: center;
 }
 .orphan {
   color: red;
@@ -414,8 +441,19 @@ function setHeaderSizes() {
     for (var i = 0; i < row.childNodes.length; ++i) {
       node = row.childNodes[i];
       if (node.nodeType === 1) {
-        var style = tr.childNodes[i].style;
-        style.minWidth = style.maxWidth = getComputedStyle(node).width;
+        var th = tr.childNodes[i];
+        th.style.minWidth = th.style.maxWidth = getComputedStyle(node).width;
+        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);
+        }
       }
     }
     if (isEmpty) headerTop.appendChild(tr);
@@ -423,6 +461,18 @@ function setHeaderSizes() {
   grid.style.marginTop = \"-\" + getComputedStyle(headerTop).height;
   // console.log(\"end\");
 }
+function doFetch(method, payload, success) {
+  payload.authenticity_token = <%= session[:_csrf_token].inspect.html_safe %>;
+  if (!success) {
+    success = function (p) {p.text().then(function (response) {
+      var result = JSON.parse(response).result;
+      if (result) location.href = location.href;
+    });};
+  }
+  var options = {method: method, headers: {\"Content-Type\": \"application/json\"}};
+  if (payload) options.body = JSON.stringify(payload);
+  return fetch(location.href, options).then(success);
+}
 if (headerTop) {
   setHeaderSizes();
   window.addEventListener('resize', function(event) {
@@ -457,8 +507,8 @@ if (headerTop) {
     });
     btnImport.addEventListener(\"click\", function () {
       fetch(changeout(<%= #{path_obj_name}_path(-1, format: :csv).inspect.html_safe %>, \"_brick_schema\", brickSchema), {
-        method: 'PATCH',
-        headers: { 'Content-Type': 'text/tab-separated-values' },
+        method: \"PATCH\",
+        headers: { \"Content-Type\": \"text/tab-separated-values\" },
         body: droppedTSV
       }).then(function (tsvResponse) {
         btnImport.style.display = \"none\";
@@ -536,6 +586,7 @@ if (headerTop) {
    if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %><%=
      description %><br><%
    end
+   # FILTER PARAMETERS
    if @_brick_params&.present? %>
   <% if @_brick_params.length == 1 # %%% Does not yet work with composite keys
        k, id = @_brick_params.first
@@ -547,38 +598,62 @@ if (headerTop) {
        end
      end %>
   (<%= link_to 'See all #{model_plural.split('::').last}', #{path_obj_name.pluralize}_path %>)
+<% end
+   # COLUMN EXCLUSIONS
+   if @_brick_excl&.present? %>
+  <div id=\"exclusions\">Excluded columns:
+  <% @_brick_excl.each do |excl| %>
+    <div class=\"colExclusion\"><%= excl %></div>
+  <% end %>
+  </div>
+  <script>
+    [... document.getElementsByClassName(\"colExclusion\")].forEach(function (excl) {
+      excl.addEventListener(\"click\", function () {
+        doFetch(\"POST\", {_brick_unexclude: this.innerHTML});
+      });
+    });
+  </script>
 <% end %>
-<br>
 <table id=\"headerTop\">
 <table id=\"#{table_name}\">
   <thead><tr>#{"<th x-order=\"#{pk.join(',')}\"></th>" if pk.present?}<%=
-     col_order = []
-     # Consider getting the name from the association -- h.first.name -- if a more \"friendly\" alias should be used for a screwy table name
-     hms_hdrs = {#{hms_headers.map do |hm|
-                    "#{hm.first.name}: [#{hm.first.name.inspect}, #{(hm.first.options[:through] && !hm.first.through_reflection).inspect}, #{hm.first.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
-                  end.join(', ')}}
-     (@#{table_name}.columns + hms_hdrs.values).each_with_object(+'') do |col, s|
-       if col.is_a?(ActiveRecord::ConnectionAdapters::Column)
-         next if (#{(pk || []).inspect}.include?(col_name = col.name) && col.type == :integer && !bts.key?(col_name)) ||
-                 ::Brick.config.metadata_columns.include?(col_name) || poly_cols.include?(col_name)
-
-         col_order << col_name
+     # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
+     cols = {#{hms_keys = []
+               hms_headers.map do |hm|
+                 hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
+                 "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
+               end.join(', ')}}
+     col_keys = @#{table_name}.columns.each_with_object([]) do |col, s|
+       col_name = col.name
+       next if @_brick_incl&.exclude?(col_name) ||
+               (#{(pk || []).inspect}.include?(col_name) && col.type == :integer && !bts.key?(col_name)) ||
+               ::Brick.config.metadata_columns.include?(col_name) || poly_cols.include?(col_name)
+
+       s << col_name
+       cols[col_name] = col
+     end
+     unless @_brick_sequence # If no sequence is defined, start with all inclusions
+       @_brick_sequence = col_keys + #{(hms_keys).inspect}.reject { |assoc_name| @_brick_incl&.exclude?(assoc_name) }
+     end
+     @_brick_sequence.reject! { |nm| @_brick_excl.include?(nm) } if @_brick_excl # Reject exclusions
+     @_brick_sequence.each_with_object(+'') do |col_name, s|
+       if (col = cols[col_name]).is_a?(ActiveRecord::ConnectionAdapters::Column)
+         s << '<th'
+         s << \" title=\\\"#\{col.comment}\\\"\" if col.respond_to?(:comment) && !col.comment.blank?
          s << if (bt = bts[col_name])
-                \"<th#\{' x-order=\"' + bt.first.to_s + '\"' unless bt[2]}>BT \" + # Allow sorting any BT except polymorphics
+                # Allow sorting for any BT except polymorphics
+                \"#\{' x-order=\"' + bt.first.to_s + '\"' unless bt[2]}>BT \" +
                 bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')
-              else
-                # Currently we always allow click to sort on non-BT columns
-                \"<th#\{' x-order=\"' + col_name + '\"' if true}>#\{col_name}\"
-              end + '</th>'
-       else # Currently we always allow click to sort on all HM columns (col is the hm array)
-         col_order << col.first # hm.name
-         s << \"<th#\{' x-order=\"' + col.first.to_s + '\"' if true}>\"
-         s << if col[1]
-                \"#\{col[3]} #\{col[4]}\" # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
-              else
-                \"#\{col[3]} #\{link_to(col[4], send(\"#\{col[2].name.underscore.tr('/', '_').pluralize}_path\"))}\"
-              end + '</th>'
+              else # Normal column
+                \"#\{' x-order=\"' + col_name + '\"' if true}>#\{col_name}\"
+              end
+       elsif col # HM column
+         s << \"<th#\{' x-order=\"' + col_name + '\"' if true}>#\{col[2]} \"
+         s << (col.first ? \"#\{col[3]}\" : \"#\{link_to(col[3], send(\"#\{col[1].name.underscore.tr('/', '_').pluralize}_path\"))}\")
+       else # Bad column name!
+         s << \"<th title=\\\"<< Unknown column >>\\\">#\{col_name}\"
        end
+       s << '</th>'
      end.html_safe
   %></tr></thead>
   <tbody>
@@ -586,16 +661,15 @@ if (headerTop) {
        hms_cols = {#{hms_columns.join(', ')}} %>
   <tr>#{"
     <td><%= link_to '⇛', #{path_obj_name}_path(#{obj_pk}), { class: 'big-arrow' } %></td>" if obj_pk}
-    <% col_order.each do |col_name|
+    <% @_brick_sequence.each do |col_name|
          val = #{obj_name}.attributes[col_name] %>
-      <td><%
+      <td<%= ' class=\"dimmed\"'.html_safe unless cols.key?(col_name)%>><%
          if (bt = bts[col_name])
            if bt[2] # Polymorphic?
              bt_class = #{obj_name}.send(\"#\{bt.first\}_type\")
              base_class = (::Brick.existing_stis[bt_class] || bt_class).constantize.base_class.name.underscore
              poly_id = #{obj_name}.send(\"#\{bt.first\}_id\")
-             %><%= link_to(\"#\{bt_class\} ##\{poly_id\}\",
-                           send(\"#\{base_class\}_path\".to_sym, poly_id)) if poly_id %><%
+             %><%= link_to(\"#\{bt_class\} ##\{poly_id\}\", send(\"#\{base_class\}_path\".to_sym, poly_id)) if poly_id %><%
            else
              bt_txt = (bt_class = bt[1].first.first).brick_descrip(
                # 0..62 because Postgres column names are limited to 63 characters
@@ -604,15 +678,14 @@ if (headerTop) {
              bt_txt ||= \"<span class=\\\"orphan\\\">&lt;&lt; Orphaned ID: #\{val} >></span>\".html_safe if val
              bt_id = bt_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) } %>
           <%= bt_id&.first ? link_to(bt_txt, send(\"#\{bt_class.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, bt_id)) : bt_txt %>
-          <%#= Previously was:  bt_obj = bt[1].first.first.find_by(bt[2] => val); link_to(bt_obj.brick_descrip, send(\"#\{bt[1].first.first.name.underscore\}_path\".to_sym, bt_obj.send(bt[1].first.first.primary_key.to_sym))) if bt_obj %>
-        <% end %>
-      <% elsif (hms_col = hms_cols[col_name])
+        <% end
+         elsif (hms_col = hms_cols[col_name])
            if hms_col.length == 1 %>
          <%= hms_col.first %>
         <% else
-             klass = (col = hms_hdrs[col_name])[2]
-             txt = if col[3] == 'HO'
-                     descrips = @_brick_bt_descrip[col_name][klass]
+             klass = (col = cols[col_name])[1]
+             txt = if col[2] == 'HO'
+                     descrips = @_brick_bt_descrip[col_name.to_sym][klass]
                      ho_txt = klass.brick_descrip(#{obj_name}, descrips[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, (ho_id_col = descrips.last))
                      ho_id = ho_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) }
                      ho_id&.first ? link_to(ho_txt, send(\"#\{klass.base_class.name.underscore.tr('/', '_')\}_path\".to_sym, ho_id)) : ho_txt
@@ -620,9 +693,11 @@ if (headerTop) {
                      \"#\{hms_col[1] || 'View'\} #\{hms_col.first}\"
                    end %>
          <%= link_to txt, send(\"#\{klass.name.underscore.tr('/', '_').pluralize}_path\".to_sym, hms_col[2]) unless hms_col[1]&.zero? %>
-        <% end %>
-      <% else
+        <% end
+         elsif cols.key?(col_name)
       %><%= hide_bcrypt(val) %><%
+         else # Bad column name!
+      %>?<%
          end
     %></td>
     <% end %>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -190,6 +190,15 @@ module Brick
       [bts, hms]
     end
 
+    def exclude_column(table, col)
+      puts "Excluding #{table}.#{col}"
+      true
+    end
+    def unexclude_column(table, col)
+      puts "Unexcluding #{table}.#{col}"
+      true
+    end
+
     # Switches Brick auto-models on or off, for all threads
     # @api public
     def enable_models=(value)

metadata

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