katalyst-tables 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3759aa46548e98b88f6528c449ae5daff86785c9511a4637bbb17c692b3c7c04
-  data.tar.gz: 3982b2749ec6c19b4a7deb279ebc78ef8415c04be64d5949d9730d55b0999474
+  metadata.gz: 4dc2698abbad7fb7b3f49ead09af73c697bdef0f31371c6b2c0c69478ab0df5f
+  data.tar.gz: dea2e28dfed3ce6c39ccf61f607755915fa86e138f3ac59f55e926049c5ec34d
 SHA512:
-  metadata.gz: 550c46bcbfec02a42c019a6f52c9339f1fb0e0046ad1368c1c2651201fc7179fb92b9f40bbb2176be27e23fff49cd7910276ea44ce19338cc8500470cb97a3cd
-  data.tar.gz: 7d56c07e0755a26d05a9b8dbe38b33f649a185ac4491961dc0130e29e5a2478860e9fb4625ddbf2844106297f13d2989e23f1d7f51a4a49e5e6d4bd9ddf8f52e
+  metadata.gz: 6ab5ffed559436e0ed73671445d653ab603e48be03f2099ae39e8b6e4bcbe2d2b503752dd2fa722b9673dbdc9a2309e52c45841dabbf6443f83a0e5dd9c57671
+  data.tar.gz: 832a7746ba587a059810117e215c5dd2011604d92e8f1be63e8842dce1b8d15153f789a41834a0a912dc6410356abda2eaa63d0574ee8c4fb372c9456146c3a2

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,7 +17,10 @@ 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) }
@@ -28,9 +31,10 @@ module Katalyst
 
           private
 
-          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}"
+          def describe_key(model, name, key)
+            label = model.human_attribute_name(name).downcase
+            value = model.human_attribute_name("#{name}.#{key}").downcase
+            "#{model.model_name.human} #{label} is #{value}"
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-tables
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 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