katalyst-tables 3.4.3 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3759aa46548e98b88f6528c449ae5daff86785c9511a4637bbb17c692b3c7c04
-  data.tar.gz: 3982b2749ec6c19b4a7deb279ebc78ef8415c04be64d5949d9730d55b0999474
+  metadata.gz: dc68e986f0047e4a30844861ec4cf0222649fa9635ca59a466846862090033da
+  data.tar.gz: fc12160c9acca555b6d5041ef49170af9630e8f6e67f81d6bec32564105e963a
 SHA512:
-  metadata.gz: 550c46bcbfec02a42c019a6f52c9339f1fb0e0046ad1368c1c2651201fc7179fb92b9f40bbb2176be27e23fff49cd7910276ea44ce19338cc8500470cb97a3cd
-  data.tar.gz: 7d56c07e0755a26d05a9b8dbe38b33f649a185ac4491961dc0130e29e5a2478860e9fb4625ddbf2844106297f13d2989e23f1d7f51a4a49e5e6d4bd9ddf8f52e
+  metadata.gz: 9d4334a6bb9b7edd4092ff131cc59a6e43ee9ce66c48c29c6aa5725585914da6c6b94e9e8cb9aa3babd8bcdaf35f24b3fc83f3d861f04e2a6294af6a8f8e3de0
+  data.tar.gz: 4a4a96c779a4ad08d0a5e1a4b415b465eb85a22b071d40321dd85f49856b372b63fd5a64ad41719a38d8bd282146eedb11982ca7821237f8ade93271b6de19d5

data/app/assets/stylesheets/katalyst/tables/typed-columns/_enum.scss

@@ -9,7 +9,11 @@
   small {
     background: var(--tag-color);
     border-radius: 0.25rem;
-    padding: 0.25rem 0.5rem;
+    padding: 0.25rem;
     font-size: small;
   }
 }
+
+table td.type-enum {
+  text-overflow: unset;
+}

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

@@ -7,7 +7,7 @@ module Katalyst
       class EnumComponent < CellComponent
         def rendered_value
           if (value = self.value).present?
-            label = t(i18n_enum_label_key(value), default: value)
+            label = collection.model.human_attribute_name("#{column}.#{value}")
             content_tag(:small, label, data: { enum: column, value: })
           end
         end
@@ -17,10 +17,6 @@ module Katalyst
         def default_html_attributes
           { class: "type-enum" }
         end
-
-        def i18n_enum_label_key(value)
-          "active_record.attributes.#{collection.model_name.i18n_key}/#{column}.#{value}"
-        end
       end
     end
   end

data/app/components/katalyst/tables/query/modal_component.rb

@@ -64,7 +64,14 @@ module Katalyst
         end
 
         def examples_for(key)
-          collection.examples_for(key)&.reject { |e| e.value.to_s.blank? } || []
+          collection.examples_for(key).filter_map do |example|
+            case example
+            when Collection::Type::Example
+              example if example.value.to_s.present?
+            else
+              raise ArgumentError, "Invalid example #{example.inspect} for #{collection.model_name}.#{key}"
+            end
+          end
         end
 
         def format_value(value)

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

@@ -17,20 +17,39 @@ module Katalyst
 
           def examples_for(scope, attribute)
             _, model, column = model_and_column_for(scope, attribute)
-            keys = model.defined_enums[column]&.keys
+
+            raise ArgumentError, "Unknown enum #{column} for #{model}" unless model.defined_enums.has_key?(column)
+
+            keys = model.defined_enums[column].keys
 
             if attribute.value_before_type_cast.present?
               keys = keys.select { |key| key.include?(attribute.value_before_type_cast.last) }
             end
 
-            keys.map { |key| example(key, describe_key(model, attribute.name, key)) }
+            keys.map { |key| example(key, describe_key(model, attribute, key)) }
           end
 
           private
 
+          def cast_value(value)
+            value.to_s
+          end
+
           def describe_key(model, attribute, key)
-            key = I18n.t("active_record.attributes.#{model.model_name.i18n_key}/#{key}", default: key.to_s.titleize)
-            "#{model.model_name.human} #{model.human_attribute_name(attribute).downcase} is #{key}"
+            label = model.human_attribute_name(attribute.name).downcase
+            value = model.human_attribute_name("#{attribute.name}.#{key}").downcase
+
+            description = "#{model.model_name.human} #{label} is #{value}"
+            description += " (default)" if default?(attribute, key)
+            description
+          end
+
+          def default?(attribute, value)
+            if multiple?
+              attribute.original_value&.intersection(cast(value))&.any?
+            else
+              attribute.default_value.eql?(cast(value))
+            end
           end
         end
       end

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

@@ -48,7 +48,10 @@ module Katalyst
           def examples_for(scope, attribute, limit: 10, order: :asc)
             scope, model, column = model_and_column_for(scope, attribute)
 
-            return unless model.attribute_types.has_key?(column)
+            unless model.attribute_types.has_key?(column)
+              raise(ArgumentError, "Unknown column '#{column}' for #{model}. " \
+                                   "Consider defining '#{attribute.name.parameterize.underscore}_examples'")
+            end
 
             column = model.arel_table[column]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.5
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katalyst-html-attributes