katalyst-koi 4.5.5 → 4.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c62ea19ccf07a39adeccee7aaefeb2b1df95a6305f80d1fec30391127e85c8
-  data.tar.gz: 9bd56feee1ba02ebec96c682fea435149bc65747bc171d9ef21df73a748f16b3
+  metadata.gz: 13cd00ba07e90a830f3a858db1fdd1f22181bf68448b0716441b66c2ce17eb84
+  data.tar.gz: 96bbf769605e6b8b4091f500e475cdb033039e037b784c7469a9ce52ade9866c
 SHA512:
-  metadata.gz: c7ab93457d42276b7ff576a01222eeb8504ea710166779d71d35cc823e09e57d0fc36ef4d83cf3345c03e7590e62741823e7469a202b6f16e1568325750fae2f
-  data.tar.gz: 3f6de676c47f5801c822d985e8f469d2831fc292704f303b1923ebd304b1b69aa81360450daa2981ea77065751233b5394ba3d9bbeb7ca19b62bcc6e454cbc7f
+  metadata.gz: b8c065374fc75587b31288078435eb2e9ad801a3e1dbf19984868d4377f0e6cf31b8e992c9b2f7a0b6761669506087c08d742faebe31a79356d6fe869c67c921
+  data.tar.gz: b159be789bf941acab6882e460ccf85858b4a5016f10195d4351b2050eb33260ae1835e404a43cee3c763a68af4a1321d017e879a7fe56225d608a9e0a58b945

data/app/components/koi/summary_list/attachment_component.rb

@@ -10,12 +10,38 @@ module Koi
       end
 
       def attribute_value
-        if raw_value.try(:representable?)
-          image_tag(@variant.nil? ? raw_value : raw_value.variant(@variant))
+        representation
+      end
+
+      def representation
+        if raw_value.try(:variable?) && named_variant.present?
+          image_tag(raw_value.variant(@variant))
         elsif raw_value.try(:attached?)
-          link_to raw_value.blob.filename, rails_blob_path(raw_value, disposition: :attachment)
+          filename.to_s
+        else
+          ""
         end
       end
+
+      def filename
+        raw_value.blob.filename
+      end
+
+      # Utility for accessing the path Rails provides for retrieving the
+      # attachment for use in cells. Example:
+      #    <% row.attachment :file do |cell| %>
+      #       <%= link_to "Download", cell.internal_path %>
+      #    <% end %>
+      def internal_path
+        rails_blob_path(raw_value, disposition: :attachment)
+      end
+
+      private
+
+      # Find the reflective variant by name (i.e. :thumb by default)
+      def named_variant
+        @model.attachment_reflections[@attribute.to_s].named_variants[@variant.to_sym]
+      end
     end
   end
 end

data/app/components/koi/tables/body.rb

@@ -190,14 +190,38 @@ module Koi
         end
 
         def rendered_value
-          if value.try(:representable?)
-            image_tag(@variant.nil? ? value : value.variant(@variant))
+          representation
+        end
+
+        def representation
+          if value.try(:variable?) && named_variant.present?
+            image_tag(value.variant(@variant))
           elsif value.try(:attached?)
-            link_to value.blob.filename, rails_blob_path(value, disposition: :attachment)
+            filename.to_s
           else
             ""
           end
         end
+
+        def filename
+          value.blob.filename
+        end
+
+        # Utility for accessing the path Rails provides for retrieving the
+        # attachment for use in cells. Example:
+        #    <% row.attachment :file do |cell| %>
+        #       <%= link_to "Download", cell.internal_path %>
+        #    <% end %>
+        def internal_path
+          rails_blob_path(value, disposition: :attachment)
+        end
+
+        private
+
+        # Find the reflective variant by name (i.e. :thumb by default)
+        def named_variant
+          object.attachment_reflections[@attribute.to_s].named_variants[@variant.to_sym]
+        end
       end
     end
   end

data/app/components/koi/tables/body_cell_component.rb

@@ -12,6 +12,10 @@ module Koi
       def rendered_value
         value.to_s
       end
+
+      def to_s
+        rendered_value
+      end
     end
   end
 end

data/app/controllers/concerns/koi/controller/has_attachments.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Koi
+  module Controller
+    module HasAttachments
+      extend ActiveSupport::Concern
+
+      # Store attachments in the given object so that they can be preserved for
+      # the next form submission.
+      #
+      # Example:
+      #     def create
+      #       @document = Document.new(document_params)
+      #       if @document.save
+      #         redirect_to [:admin, @document], status: :see_other
+      #       else
+      #         store_attachments(@document)
+      #         render :new, status: :unprocessable_entity
+      #       end
+      #     end
+      #
+      # @param resource [ActiveRecord::Base] The object being edited
+      def save_attachments!(resource)
+        resource.attachment_changes.each_value do |change|
+          case change
+          when ActiveStorage::Attached::Changes::CreateOne
+            change.upload
+            change.blob.save!
+          when ActiveStorage::Attached::Changes::CreateMany
+            change.upload
+            change.blobs.each(&:save!)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/koi/controller/is_admin_controller.rb

@@ -13,6 +13,7 @@ module Koi
 
       included do
         include HasAdminUsers
+        include HasAttachments
         include Katalyst::Tables::Backend
         include Pagy::Backend
 

data/lib/govuk_design_system_formbuilder/elements/document.rb

@@ -55,7 +55,7 @@ module GOVUKDesignSystemFormBuilder
     # Generates a +div+ element with an +input+ with +type=file+ with a label, optional hint.
     #
     # @example A upload field with label as a proc
-    #   = f.govuk_file_field :data, label: -> { tag.h3('Upload your document') }
+    #   = f.govuk_document_field :data, label: -> { tag.h3('Upload your document') }
     #
     def govuk_document_field(attribute_name, label: {}, caption: {}, hint: {}, form_group: {}, **kwargs, &block)
       Elements::Document.new(self, object_name, attribute_name, label:, caption:, hint:, form_group:, **kwargs,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 4.5.5
+  version: 4.5.7
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -331,6 +331,7 @@ files:
 - app/controllers/admin/tokens_controller.rb
 - app/controllers/admin/url_rewrites_controller.rb
 - app/controllers/concerns/koi/controller/has_admin_users.rb
+- app/controllers/concerns/koi/controller/has_attachments.rb
 - app/controllers/concerns/koi/controller/has_webauthn.rb
 - app/controllers/concerns/koi/controller/is_admin_controller.rb
 - app/controllers/concerns/koi/controller/json_web_token.rb