Merge pull request #10998 from alphagov/single-upload-of-image-kind

Single Upload of Image Kind [WHIT-2857]

Author: patrickpatrickpatrick

app/components/admin/edition_images/uploaded_images_component.html.erb

@@ -1,4 +1,4 @@
-<% if edition.configurable_document_type.present? %>
+<% if edition.configurable_document_type.present? && edition.allows_lead_image? %>
   <%= render "govuk_publishing_components/components/heading", {
     text: "Select a lead image",
     font_size: "l",

app/components/admin/edition_images/uploaded_images_component.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: true
 
 class Admin::EditionImages::UploadedImagesComponent < ViewComponent::Base
-  def initialize(edition:)
+  def initialize(edition:, image_kind: Whitehall.image_kinds.fetch("default"))
     @edition = edition
+    @image_kind = image_kind
   end
 
 private
 
   attr_reader :edition
 
   def document_images
-    return edition.images unless edition.can_have_custom_lead_image?
+    edition_images = edition.images.select { |image| Whitehall.image_kinds.fetch(image.image_data.image_kind) == @image_kind }
 
-    edition.images - [edition.lead_image].compact
+    return edition_images unless edition.can_have_custom_lead_image?
+
+    edition_images - [edition.lead_image].compact
   end
 end

app/controllers/admin/edition_images_controller.rb

@@ -41,9 +41,7 @@ def update
   def create
     @images = images_params.map { |image| create_image(image) }
 
-    if @images.empty?
-      flash.now.alert = "No images selected. Choose a valid JPEG, PNG, SVG or GIF."
-    elsif @images.all?(&:valid?)
+    if @images.all?(&:valid?)
       @images.each(&:save)
       @edition.update_lead_image if @edition.can_have_custom_lead_image?
       PublishingApiDocumentRepublishingWorker.perform_async(@edition.document_id, false)
@@ -53,7 +51,11 @@ def create
       @images.each { |image| @edition.images.delete(image) }
     end
 
-    render :index
+    if @images.count == 1 && @images.first.valid?
+      redirect_to edit_admin_edition_image_path(@edition, @images.first.id)
+    else
+      render :index
+    end
   end
 
   def create_image(image)
@@ -119,7 +121,7 @@ def enforce_permissions!
   end
 
   def images_params
-    params.fetch(:images, []).map { |image| image.permit(image_data: %i[file]) }
+    params.fetch(:images, []).map { |image| image.permit(image_data: %i[file image_kind]) }
   end
 
   def image_data_params

app/models/concerns/edition/images.rb

@@ -21,7 +21,11 @@ def process_associations_after_save(edition)
   end
 
   included do
-    has_many :images, foreign_key: "edition_id", dependent: :destroy
+    has_many :images, foreign_key: "edition_id", dependent: :destroy do
+      def of_kind(image_kind)
+        joins(:image_data).where(image_data: { image_kind: image_kind })
+      end
+    end
 
     accepts_nested_attributes_for :images, reject_if: :no_substantive_attributes?, allow_destroy: true
 

app/models/configurable_document_types/government_response.json

@@ -79,7 +79,15 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "government_response",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true,
+      "permitted_image_kinds": [
+        {
+          "kind": "govspeak_embed",
+          "multiple": true
+        }
+      ]
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,

app/models/configurable_document_types/history_page.json

@@ -72,7 +72,15 @@
     "publishing_api_schema_name": "history",
     "publishing_api_document_type": "history",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true,
+      "permitted_image_kinds": [
+        {
+          "kind": "govspeak_embed",
+          "multiple": true
+        }
+      ]
+    },
     "send_change_history": false,
     "organisations": ["af07d5a5-df63-4ddc-9383-6a666845ebe9"],
     "backdating_enabled": false,

app/models/configurable_document_types/news_story.json

@@ -79,7 +79,15 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "news_story",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true,
+      "permitted_image_kinds": [
+        {
+          "kind": "govspeak_embed",
+          "multiple": true
+        }
+      ]
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,

app/models/configurable_document_types/press_release.json

@@ -79,7 +79,15 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "press_release",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true,
+      "permitted_image_kinds": [
+        {
+          "kind": "govspeak_embed",
+          "multiple": true
+        }
+      ]
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,

app/models/configurable_document_types/topical_event.json

@@ -111,7 +111,19 @@
     "publishing_api_schema_name": "topical_event",
     "publishing_api_document_type": "topical_event",
     "rendering_app": "collections",
-    "images_enabled": false,
+    "images": {
+      "enabled": true,
+      "permitted_image_kinds": [
+        {
+          "kind": "header",
+          "multiple": false
+        },
+        {
+          "kind": "logo",
+          "multiple": false
+        }        
+      ]
+    },
     "send_change_history": true,
     "file_attachments_enabled": false,
     "organisations": null,

app/models/configurable_document_types/world_news_story.json

@@ -78,7 +78,15 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "world_news_story",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true,
+      "permitted_image_kinds": [
+        {
+          "kind": "govspeak_embed",
+          "multiple": true
+        }
+      ]
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,