katalyst-tables 3.6.2 → 3.8.0

data/app/assets/stylesheets/katalyst/tables.css

@@ -0,0 +1,3 @@
+@import url("tables/query.css");
+@import url("tables/table.css");
+@import url("tables/summary.css");

data/app/components/concerns/katalyst/tables/orderable.rb

@@ -55,7 +55,7 @@ module Katalyst
             action: %W[mousedown->#{LIST_CONTROLLER}#mousedown
                        turbo:before-morph-element->#{LIST_CONTROLLER}#beforeMorphElement:self],
             "#{LIST_CONTROLLER}-#{FORM_CONTROLLER}-outlet" => "##{Orderable.default_form_id(collection)}",
-            "#{LIST_CONTROLLER}-#{ITEM_CONTROLLER}-outlet" => "td.ordinal",
+            "#{LIST_CONTROLLER}-#{ITEM_CONTROLLER}-outlet" => "td[data-cell-type=ordinal]",
           },
         )
       end

data/app/components/concerns/katalyst/tables/sortable.rb

@@ -58,7 +58,7 @@ module Katalyst
         end
 
         def default_html_attributes
-          { data: { turbo_action: "replace" } }
+          { class: "sortable", data: { turbo_action: "replace" } }
         end
       end
     end

data/app/components/katalyst/summary_table_component.rb

@@ -21,8 +21,6 @@ module Katalyst
       super(collection: [model], **)
 
       @summary_rows = []
-
-      update_html_attributes(class: "summary-table")
     end
 
     def with_cell(cell, &)
@@ -40,5 +38,9 @@ module Katalyst
         @index += 1
       end
     end
+
+    def default_html_attributes
+      { class: "katalyst--summary-table" }
+    end
   end
 end

data/app/components/katalyst/table_component.rb

@@ -230,7 +230,7 @@ module Katalyst
     # @example Render a generic text column for any value that supports `to_s`
     #   <% row.enum :status %>
     #   <%# label => <th>Status</th> %>
-    #   <%# data => <td class="type-enum"><span data-enum="status" data-value="published">Published</span></td> %>
+    #   <%# data => <td data-cell-type="enum"><span data-enum="status" data-value="published">Published</span></td> %>
     def enum(column, label: nil, heading: false, **, &)
       with_cell(Tables::Cells::EnumComponent.new(
                   collection:, row:, column:, record:, label:, heading:, **,
@@ -317,6 +317,10 @@ module Katalyst
 
     private
 
+    def default_html_attributes
+      { class: "katalyst--table" }
+    end
+
     # Extension point for subclasses and extensions to customize header row rendering.
     def add_header_row_callback(&block)
       @header_row_callbacks << block

data/app/components/katalyst/tables/cells/boolean_component.rb

@@ -12,7 +12,7 @@ module Katalyst
         private
 
         def default_html_attributes
-          { class: "type-boolean" }
+          { data: { cell_type: "boolean" } }
         end
       end
     end

data/app/components/katalyst/tables/cells/currency_component.rb

@@ -40,7 +40,7 @@ module Katalyst
         private
 
         def default_html_attributes
-          { class: "type-currency" }
+          { data: { cell_type: "currency" } }
         end
       end
     end

data/app/components/katalyst/tables/cells/date_component.rb

@@ -26,7 +26,7 @@ module Katalyst
 
         def default_html_attributes
           {
-            class: "type-date",
+            data:  { cell_type: "date" },
             title: (absolute_time if row.body? && @relative && value.present? && days_ago_in_words(value).present?),
           }
         end

data/app/components/katalyst/tables/cells/date_time_component.rb

@@ -28,7 +28,7 @@ module Katalyst
 
         def default_html_attributes
           {
-            class: "type-datetime",
+            data:  { cell_type: "datetime" },
             title: (absolute_time if row.body? && @relative && today?),
           }
         end

data/app/components/katalyst/tables/cells/enum_component.rb

@@ -15,7 +15,7 @@ module Katalyst
         private
 
         def default_html_attributes
-          { class: "type-enum" }
+          { data: { cell_type: "enum" } }
         end
       end
     end

data/app/components/katalyst/tables/cells/number_component.rb

@@ -44,7 +44,7 @@ module Katalyst
         private
 
         def default_html_attributes
-          { class: "type-number" }
+          { data: { cell_type: "number" } }
         end
       end
     end

data/app/components/katalyst/tables/cells/ordinal_component.rb

@@ -18,11 +18,11 @@ module Katalyst
 
         def default_html_attributes
           if @row.header?
-            { class: "ordinal" }
+            { data: { cell_type: "ordinal" } }
           else
             {
-              class: "ordinal",
-              data:  {
+              data: {
+                cell_type:                                    "ordinal",
                 controller:                                   Orderable::ITEM_CONTROLLER,
                 "#{Orderable::ITEM_CONTROLLER}-params-value": params.to_json,
               },

data/app/components/katalyst/tables/cells/rich_text_component.rb

@@ -11,7 +11,7 @@ module Katalyst
 
         def default_html_attributes
           {
-            class: "type-rich-text",
+            data:  { cell_type: "rich-text" },
             title: (value.to_plain_text unless row.header?),
           }
         end

data/app/components/katalyst/tables/cells/select_component.rb

@@ -24,16 +24,16 @@ module Katalyst
         def default_html_attributes
           if @row.header?
             {
-              class: "selection",
-              data:  {
+              data: {
+                cell_type: "selection",
                 "#{Selectable::TABLE_CONTROLLER}-target" => "header",
                 action: "change->#{Selectable::TABLE_CONTROLLER}#toggleHeader",
               },
             }
           else
             {
-              class: "selection",
-              data:  {
+              data: {
+                cell_type: "selection",
                 controller: Selectable::ITEM_CONTROLLER,
                 action: "change->#{Selectable::ITEM_CONTROLLER}#change",
                 "#{Selectable::ITEM_CONTROLLER}-params-value" => @params.to_json,

data/app/components/katalyst/tables/query/input_component.html.erb

@@ -15,5 +15,5 @@
       ) %>
   <div aria-hidden="true" class="highlight" data-tables--query-input-target="highlight"><%= form.object.query %></div>
   <%= form.hidden_field(:p) %>
-  <%= form.button("Apply", type: :submit, name: nil, tabindex: -1) %>
+  <%= form.button("Apply", type: :submit, name: nil, tabindex: -1, class: "button") %>
 <% end %>

data/app/components/katalyst/tables/query/modal_component.html.erb

@@ -9,7 +9,7 @@
   <div class="content">
     <% if suggestions? %>
       <h4 id="suggestions-title"><%= t(".suggestions_title") %></h4>
-      <ul id="suggestions" role="listbox" aria-labelledby="suggestions-title">
+      <ul id="suggestions" class="suggestions" role="listbox" aria-labelledby="suggestions-title">
         <% suggestions.each do |suggestion| %>
           <%= render suggestion %>
         <% end %>

data/app/components/katalyst/tables/query_component.rb

@@ -80,7 +80,8 @@ module Katalyst
 
       def default_html_attributes
         {
-          data: {
+          class: "katalyst--tables--query",
+          data:  {
             controller:   "tables--query",
             turbo_action: :replace,
             action:       %w[

data/app/models/katalyst/tables/suggestions/constant_value.rb

@@ -6,12 +6,10 @@ module Katalyst
       class ConstantValue < Base
         delegate :to_param, to: :@attribute_type
 
-        def initialize(name:, type:, model:, column:, value:)
+        def initialize(name:, type:, value:)
           super(value)
 
           @attribute_type = type
-          @model = model
-          @column = column
           @name = name
         end
 

data/app/models/katalyst/tables/suggestions/database_value.rb

@@ -4,16 +4,12 @@ module Katalyst
   module Tables
     module Suggestions
       class DatabaseValue < Base
-        attr_reader :model, :column
-
         delegate :to_param, to: :@attribute_type
 
-        def initialize(name:, type:, model:, column:, value:)
+        def initialize(name:, type:, value:)
           super(value)
 
           @attribute_type = type
-          @model = model
-          @column = column
           @name = name
         end
 

data/lib/katalyst/tables/collection/type/boolean.rb

@@ -22,16 +22,14 @@ module Katalyst
             end
           end
 
-          def suggestions(scope, attribute)
-            _, model, column = model_and_column_for(scope, attribute)
-
+          def suggestions(_scope, attribute)
             values = %w[true false]
 
             if attribute.value_before_type_cast.present?
               values = values.select { |value| value.include?(attribute.value_before_type_cast) }
             end
 
-            values.map { |v| constant_suggestion(attribute:, model:, column:, value: deserialize(v)) }
+            values.map { |v| constant_suggestion(attribute:, value: deserialize(v)) }
           end
         end
       end

data/lib/katalyst/tables/collection/type/date.rb

@@ -7,6 +7,8 @@ module Katalyst
         class Date < Value
           include Helpers::Range
 
+          ISO_DATE = /\A(?<year>\d{4})-(?<month>\d\d)-(?<day>\d\d)\z/
+
           define_range_patterns /\d{4}-\d\d-\d\d/
 
           def type
@@ -23,21 +25,17 @@ module Katalyst
           end
 
           def suggestions(scope, attribute)
-            _, model, column = model_and_column_for(scope, attribute)
-
             [
               *super(scope, attribute, limit: 6, order: :desc),
-              database_suggestion(attribute:, model:, column:, value: ::Date.current.beginning_of_week..),
-              database_suggestion(attribute:, model:, column:, value: ::Date.current.beginning_of_month..),
-              database_suggestion(attribute:, model:, column:, value: 1.month.ago.all_month),
-              database_suggestion(attribute:, model:, column:, value: 1.year.ago.all_year),
+              database_suggestion(attribute:, value: ::Date.current.beginning_of_week..),
+              database_suggestion(attribute:, value: ::Date.current.beginning_of_month..),
+              database_suggestion(attribute:, value: 1.month.ago.all_month),
+              database_suggestion(attribute:, value: 1.year.ago.all_year),
             ]
           end
 
           private
 
-          ISO_DATE = /\A(?<year>\d{4})-(?<month>\d\d)-(?<day>\d\d)\z/
-
           def cast_value(value)
             return value unless value.is_a?(::String)
 

data/lib/katalyst/tables/collection/type/enum.rb

@@ -16,7 +16,15 @@ module Katalyst
           end
 
           def suggestions(scope, attribute)
-            _, model, column = model_and_column_for(scope, attribute)
+            model = scope.model
+            column = attribute.name
+
+            if attribute.name.include?(".")
+              table_name, column = attribute.name.split(".")
+              model = scope.model.reflections[table_name].klass
+
+              raise(ArgumentError, "Unknown association '#{table_name}' for #{scope.model}") unless model
+            end
 
             raise ArgumentError, "Unknown enum #{column} for #{model}" unless model.defined_enums.has_key?(column)
 
@@ -26,7 +34,7 @@ module Katalyst
               values = values.select { |key| key.include?(attribute.value_before_type_cast) }
             end
 
-            values.map { |value| constant_suggestion(attribute:, model:, column:, value:) }
+            values.map { |value| constant_suggestion(attribute:, value:) }
           end
 
           private

data/lib/katalyst/tables/collection/type/string.rb

@@ -5,8 +5,6 @@ module Katalyst
     module Collection
       module Type
         class String < Value
-          include ActiveRecord::Sanitization::ClassMethods
-
           attr_reader :exact
           alias_method :exact?, :exact
 
@@ -21,11 +19,32 @@ module Katalyst
 
           private
 
-          def filter_condition(model, column, value)
-            if exact? || scope
+          class Match
+            include ActiveRecord::Sanitization::ClassMethods
+
+            attr_reader :value
+
+            def initialize(value)
+              @value = value
+            end
+
+            def to_sql
+              "%#{sanitize_sql_like(value)}%"
+            end
+          end
+
+          class MatchHandler
+            def call(attribute, value)
+              attribute.matches(value.to_sql)
+            end
+          end
+
+          def apply_filter(scope, model, attribute, value)
+            if exact?
               super
             else
-              model.where(model.arel_table[column].matches("%#{sanitize_sql_like(value)}%"))
+              model.predicate_builder.register_handler(Match, MatchHandler.new)
+              scope.where(attribute.name => Match.new(value))
             end
           end
         end

data/lib/katalyst/tables/collection/type/value.rb

@@ -33,10 +33,18 @@ module Katalyst
           def filter(scope, attribute, value: filter_value(attribute))
             return scope unless filter?(attribute, value)
 
-            scope, model, column = model_and_column_for(scope, attribute)
-            condition = filter_condition(model, column, value)
+            if self.scope.present?
+              scope.public_send(self.scope, value)
+            elsif attribute.name.include?(".")
+              table_name, = attribute.name.split(".")
+              association = scope.model.reflections[table_name]
 
-            scope.merge(condition)
+              raise(ArgumentError, "Unknown association '#{table_name}' for #{scope.model}") unless association
+
+              apply_filter(scope.joins(table_name.to_sym), association.klass, attribute, value)
+            else
+              apply_filter(scope, scope.model, attribute, value)
+            end
           end
 
           def to_param(value)
@@ -44,54 +52,51 @@ module Katalyst
           end
 
           def suggestions(scope, attribute, limit: 10, order: :asc)
-            scope, model, column = model_and_column_for(scope, attribute)
+            model = scope.model
+            column = attribute.name
+
+            if attribute.name.include?(".")
+              table_name, column = attribute.name.split(".")
+              model = scope.model.reflections[table_name].klass
+
+              raise(ArgumentError, "Unknown association '#{table_name}' for #{scope.model}") unless model
+
+              scope = scope.joins(table_name.to_sym)
+            end
 
             unless model.attribute_types.has_key?(column)
               raise(ArgumentError, "Unknown column '#{column}' for #{model}. " \
                                    "Consider defining '#{attribute.name.parameterize.underscore}_suggestions'")
             end
 
-            arel_column = model.arel_table[column]
-
             filter(scope, attribute)
-              .group(arel_column)
+              .group(attribute.name)
               .distinct
               .limit(limit)
-              .reorder(arel_column => order)
-              .pluck(arel_column)
-              .map { |v| database_suggestion(attribute:, model:, column:, value: deserialize(v)) }
+              .reorder(attribute.name => order)
+              .pluck(attribute.name)
+              .map { |v| database_suggestion(attribute:, value: deserialize(v)) }
           end
 
           private
 
-          def constant_suggestion(attribute:, model:, column:, value:)
-            Tables::Suggestions::ConstantValue.new(name: attribute.name, type: attribute.type, model:, column:, value:)
+          def constant_suggestion(attribute:, value:)
+            Tables::Suggestions::ConstantValue.new(name: attribute.name, type: attribute.type, value:)
           end
 
-          def database_suggestion(attribute:, model:, column:, value:)
-            Tables::Suggestions::DatabaseValue.new(name: attribute.name, type: attribute.type, model:, column:, value:)
+          def database_suggestion(attribute:, value:)
+            Tables::Suggestions::DatabaseValue.new(name: attribute.name, type: attribute.type, value:)
           end
 
           def filter_value(attribute)
             attribute.value
           end
 
-          def filter_condition(model, column, value)
+          def apply_filter(scope, _model, attribute, value)
             if value.nil?
-              model.none
-            elsif scope
-              model.public_send(scope, value)
-            else
-              model.where(column => serialize(value))
-            end
-          end
-
-          def model_and_column_for(scope, attribute)
-            if attribute.name.include?(".")
-              table, column = attribute.name.split(".")
-              [scope.joins(table.to_sym), scope.model.reflections[table].klass, column]
+              scope.none
             else
-              [scope, scope.model, attribute.name]
+              scope.where(attribute.name => serialize(value))
             end
           end
         end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.8.0
 platform: ruby
 authors:
 - Katalyst Interactive
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katalyst-html-attributes
@@ -54,19 +53,13 @@ files:
 - app/assets/builds/katalyst/tables.min.js
 - app/assets/builds/katalyst/tables.min.js.map
 - app/assets/config/katalyst-tables.js
-- app/assets/stylesheets/katalyst/tables/_index.scss
-- app/assets/stylesheets/katalyst/tables/_ordinal.scss
-- app/assets/stylesheets/katalyst/tables/_query.scss
-- app/assets/stylesheets/katalyst/tables/_select.scss
-- app/assets/stylesheets/katalyst/tables/_summary.scss
-- app/assets/stylesheets/katalyst/tables/_table.scss
-- app/assets/stylesheets/katalyst/tables/typed-columns/_boolean.scss
-- app/assets/stylesheets/katalyst/tables/typed-columns/_currency.scss
-- app/assets/stylesheets/katalyst/tables/typed-columns/_date.scss
-- app/assets/stylesheets/katalyst/tables/typed-columns/_datetime.scss
-- app/assets/stylesheets/katalyst/tables/typed-columns/_enum.scss
-- app/assets/stylesheets/katalyst/tables/typed-columns/_index.scss
-- app/assets/stylesheets/katalyst/tables/typed-columns/_number.scss
+- app/assets/images/katalyst/tables/icons/sort-asc.svg
+- app/assets/images/katalyst/tables/icons/sort-desc.svg
+- app/assets/stylesheets/katalyst/_tables.scss
+- app/assets/stylesheets/katalyst/tables.css
+- app/assets/stylesheets/katalyst/tables/query.css
+- app/assets/stylesheets/katalyst/tables/summary.css
+- app/assets/stylesheets/katalyst/tables/table.css
 - app/components/concerns/katalyst/tables/has_table_content.rb
 - app/components/concerns/katalyst/tables/identifiable.rb
 - app/components/concerns/katalyst/tables/orderable.rb
@@ -175,7 +168,6 @@ metadata:
   homepage_uri: https://github.com/katalyst/tables
   source_code_uri: https://github.com/katalyst/tables
   changelog_uri: https://github.com/katalyst/tables/blobs/main/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: HTML table generator for Rails views
 test_files: []

data/app/assets/stylesheets/katalyst/tables/_index.scss

@@ -1,3 +0,0 @@
-@use "query";
-@use "table";
-@use "summary";

data/app/assets/stylesheets/katalyst/tables/_ordinal.scss

@@ -1,38 +0,0 @@
-$width: 2rem !default;
-$time: 125ms !default;
-
-table {
-  tr {
-    transition:
-      top $time ease-in-out,
-      transform $time ease-in-out;
-  }
-
-  tr[dragging] {
-    transition: transform $time ease-in-out;
-    filter: drop-shadow(0 0 0.5rem var(--row-border-color));
-    transform: scale(1.01);
-    td {
-      box-shadow: none;
-    }
-  }
-
-  th.ordinal {
-    width: $width;
-    padding-left: 0;
-    a {
-      width: $width;
-      height: 3rem;
-    }
-    a::after {
-      margin-left: 0.4rem;
-    }
-  }
-
-  td.ordinal {
-    width: $width;
-    padding-left: 0;
-    cursor: grab;
-    text-align: center;
-  }
-}