katalyst-koi 5.11.2 → 5.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea4f9e29a1eef22e9a178c663b56950384655fb7c91d27cccfbe406b1aaf7d93
-  data.tar.gz: 7cd1ddf3134fdff40742dd19e0667a58060519ef1b21214003c1f5894dc10a52
+  metadata.gz: 7332f9e231b03a10934316e6be8d9fb00659b7231a8fef96379ef3631a335776
+  data.tar.gz: e1bf94e76433c4c11f0df385ba2c87df0cccec83d9f3275ee4c46bb171fc25a8
 SHA512:
-  metadata.gz: a0ac94af56d9f31ba511cc25e747d3d72002c1b5997c0fa6094898d4b430810325c2b34efd3baf817ffe94797de4fc4ec2f7aa2ce6f9b60e4c0fd4375d9c1fde
-  data.tar.gz: 1f74e303e8430572b1c5191ae303014f26bc7ea69a073483693f8a3c9945e640d7701ba4a6152f8d8d46383771b7f0d1fdea42dd622863e2a0cd444a1713a341
+  metadata.gz: 7403b011c65fd38c2e3443bcd8ee2a86cc8a3310298e75c5d7f9ebe1a4a04d36d9b8aaca02dad92f8ea99a5396888a6785601bdd11934bf88fe3f820bafeae4f
+  data.tar.gz: 7ee5ecda0d9265dae2cb1a18496ad5ac2b529a34a0032987dbedc357d198d114d256cd8bb0e5ef8104536157d114712b54a67f77bef44ac5439c73f56ab95371

data/app/assets/stylesheets/koi/forms/file-upload.css

@@ -114,7 +114,7 @@
   display: grid;
   grid-template-areas: "preview caption actions";
   grid-template-columns: auto 1fr auto;
-  margin: 0 0 var(--flow-space) 0;
+  margin: unset;
   padding: var(--space-xs);
   grid-gap: var(--space-s);
   border: 1px solid var(--color-mid);
@@ -243,6 +243,12 @@ display, tab order, and accessibility tree. */
   }
 }
 
+.govuk-file-upload-wrapper:has(input[type="file"][multiple]) {
+  .govuk-attachment + .govuk-attachment {
+    margin-block-start: var(--space-xs);
+  }
+}
+
 /* Movement */
 
 .govuk-attachment {

data/app/components/concerns/koi/tables/cells.rb

@@ -31,7 +31,8 @@ module Koi
                   ), &)
       end
 
-      # Generates a column that renders an ActiveStorage attachment as a downloadable link.
+      # Generates a column that renders ActiveStorage attachments, from either
+      # has_one_attached or has_many_attached associations.
       #
       # @param column [Symbol] the column's name, called as a method on the record
       # @param label [String|nil] the label to use for the column header

data/app/components/koi/tables/cells/attachment_component.rb

@@ -5,9 +5,10 @@ module Koi
     module Cells
       # Shows an attachment
       #
-      # The value is expected to be an ActiveStorage attachment
+      # The value is expected to be an ActiveStorage attachment, either
+      # singular (has_one_attached) or plural (has_many_attached).
       #
-      # If it is representable, shows as a image tag using the specified variant.
+      # If it is representable, shows as an image tag using the specified variant.
       #
       # Otherwise shows as a link to download.
       class AttachmentComponent < Katalyst::Tables::CellComponent
@@ -18,21 +19,19 @@ module Koi
         end
 
         def rendered_value
-          representation
+          safe_join(attachments.map { |attachment| representation(attachment) })
         end
 
-        def representation
-          if value.try(:variable?) && named_variant.present?
-            image_tag(value.variant(@variant))
-          elsif value.try(:attached?)
-            filename.to_s
+        def representation(attachment = value.attachment)
+          if attachment&.variable? && named_variant.present?
+            image_tag(attachment.variant(@variant))
           else
-            ""
+            attachment&.filename.to_s
           end
         end
 
         def filename
-          value.blob.filename
+          value.attachment&.filename
         end
 
         # Utility for accessing the path Rails provides for retrieving the
@@ -46,6 +45,11 @@ module Koi
 
         private
 
+        # Attached::One and Attached::Many normalized to [ActiveStorage::Attachment]
+        def attachments
+          value.is_a?(ActiveStorage::Attached::Many) ? value.attachments : Array(value.attachment)
+        end
+
         def default_html_attributes
           { class: "type-attachment" }
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 5.11.2
+  version: 5.11.3
 platform: ruby
 authors:
 - Katalyst Interactive