katalyst-tables 3.4.2 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b072cb596f235569c734c00f85602d8942c30fdf7352e67a07a3d7ed0470964
-  data.tar.gz: 40b3eb109d0b752b82ab86e7f9b8335c17f076d229286be6edce7afcc07533ec
+  metadata.gz: 4dc2698abbad7fb7b3f49ead09af73c697bdef0f31371c6b2c0c69478ab0df5f
+  data.tar.gz: dea2e28dfed3ce6c39ccf61f607755915fa86e138f3ac59f55e926049c5ec34d
 SHA512:
-  metadata.gz: dbd90a0224464a0961768428eac24df7b9242ca3805bddce60fbdb28fbcfb9e8271945ac623c478b655c502b115517dfc6609645eadccfa81c60f14bd2b35b7c
-  data.tar.gz: d6f1697681c96fe1d9346e68044d799e95c6547e6936afddb396a5cd782e49890434696aaff9454aa32064960ba1e9af2bd4a84693145e5c3deb4c592d4d31d0
+  metadata.gz: 6ab5ffed559436e0ed73671445d653ab603e48be03f2099ae39e8b6e4bcbe2d2b503752dd2fa722b9673dbdc9a2309e52c45841dabbf6443f83a0e5dd9c57671
+  data.tar.gz: 832a7746ba587a059810117e215c5dd2011604d92e8f1be63e8842dce1b8d15153f789a41834a0a912dc6410356abda2eaa63d0574ee8c4fb372c9456146c3a2

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

@@ -72,8 +72,9 @@
   dl {
     display: grid;
     grid-auto-flow: row;
-    grid-auto-rows: 1fr;
-    grid-template-columns: 1fr 4fr;
+    grid-auto-rows: auto;
+    grid-template-columns: auto 1fr;
+    gap: 0 1rem;
   }
 
   dt {
@@ -85,11 +86,6 @@
     color: #666;
   }
 
-  ul {
-    list-style: none;
-    padding-left: 0;
-  }
-
   .error {
     background: #fff2f2;
     border-bottom: 1px solid #fdd3d3;

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

@@ -9,6 +9,7 @@ $row-border-color: $grey !default;
 $row-height: 48px !default;
 $cell-spacing: 0.5rem !default;
 $tag-color: $grey !default;
+$on-tag-color: black !default;
 
 $width-small: 6rem !default;
 $width-medium: 12rem !default;
@@ -20,6 +21,7 @@ table {
   --table-header-color: #{$table-header-color};
   --row-border-color: #{$row-border-color};
   --tag-color: #{$tag-color};
+  --on-tag-color: #{$on-tag-color};
 
   --width-small: #{$width-small};
   --width-medium: #{$width-medium};

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

@@ -2,8 +2,14 @@
   width: var(--width-small);
 }
 
-:where(td.type-enum small) {
-  background: var(--tag-color);
-  border-radius: 0.25rem;
-  padding: 0.25rem 0.5rem;
+:where(td.type-enum) {
+  // ensure ellipsis is the correct color
+  color: var(--on-tag-color);
+
+  small {
+    background: var(--tag-color);
+    border-radius: 0.25rem;
+    padding: 0.25rem 0.5rem;
+    font-size: small;
+  }
 }

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/date.rb

@@ -24,7 +24,7 @@ module Katalyst
 
           def examples_for(scope, attribute)
             [
-              *super(scope, attribute, limit: 6),
+              *super(scope, attribute, limit: 6, order: :desc),
               example(::Date.current.beginning_of_week.., "this week"),
               example(::Date.current.beginning_of_month.., "this month"),
               example(1.month.ago.all_month, "last month"),

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.2
+  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