Merge pull request #11358 from alphagov/image-workflow-related

patrickpatrickpatrick · web-flow · commit 343476586e53 · 2026-04-24T13:15:53.000+01:00
Add `title` to `ImageUsage` [WHIT-3298]
diff --git a/app/components/admin/edition_images/image_card_component.html.erb b/app/components/admin/edition_images/image_card_component.html.erb
@@ -1,7 +1,7 @@
 <%= render "govuk_publishing_components/components/summary_card", {
   id: "uploaded_#{image_usage.key}_image_card",
-  title: image_usage.label&.titleize || image_usage.key.titleize,
   summary_card_actions: summary_card_actions,
+  title: image_usage.title.upcase_first,
   rows: [
     {
       key: "Image",
diff --git a/app/components/admin/edition_images/image_upload_component.html.erb b/app/components/admin/edition_images/image_upload_component.html.erb
@@ -1,9 +1,10 @@
 <%
   image_kind = image_usage.kinds.first
+  image_usage_title = image_usage.title.downcase
 
-  hint_text = ["A #{image_kind.display_name} image must be at least <strong>#{image_kind.valid_width}x#{image_kind.valid_height}</strong>."]
+  hint_text = ["#{image_usage_title.articleize.upcase_first} must be at least <strong>#{image_kind.valid_width}x#{image_kind.valid_height}</strong>."]
   unless image_usage.multiple
-    hint_text << " If you are uploading more than one image, <a class=\"govuk-link\" href=\"https://www.gov.uk/guidance/how-to-publish-on-gov-uk/images-and-videos\">read the image guidance</a> on using unique file names."
+    hint_text << " If you are uploading more than one #{image_usage_title}, <a class=\"govuk-link\" href=\"https://www.gov.uk/guidance/how-to-publish-on-gov-uk/images-and-videos\">read the image guidance</a> on using unique file names."
   end
 %>
 
diff --git a/app/components/admin/edition_images/lead_image_card_component.html.erb b/app/components/admin/edition_images/lead_image_card_component.html.erb
@@ -6,7 +6,7 @@
 
 <%= render "govuk_publishing_components/components/summary_card", {
   id: "uploaded_#{image_usage.key}_image_card",
-  title: image_usage.label&.titleize || image_usage.key.titleize,
+  title: image_usage.title.upcase_first,
   summary_card_actions: summary_card_actions,
   rows: [
     {
diff --git a/app/models/configurable_document_types/case_study.json b/app/models/configurable_document_types/case_study.json
@@ -99,7 +99,6 @@
           "caption_enabled": true
         },        
         "lead": {
-          "label": "lead",
           "kinds": ["default"],
           "multiple": false,
           "caption_enabled": true
diff --git a/app/models/configurable_document_types/government_response.json b/app/models/configurable_document_types/government_response.json
@@ -115,7 +115,6 @@
           "caption_enabled": true
         },
         "lead": {
-          "label": "lead",
           "kinds": ["default"],
           "multiple": false,
           "caption_enabled": true
diff --git a/app/models/configurable_document_types/news_story.json b/app/models/configurable_document_types/news_story.json
@@ -115,7 +115,6 @@
           "caption_enabled": true
         },
         "lead": {
-          "label": "lead",
           "kinds": ["default"],
           "multiple": false,
           "caption_enabled": true
diff --git a/app/models/configurable_document_types/press_release.json b/app/models/configurable_document_types/press_release.json
@@ -115,7 +115,6 @@
           "caption_enabled": true
         },
         "lead": {
-          "label": "lead",
           "kinds": ["default"],
           "multiple": false,
           "caption_enabled": true
diff --git a/app/models/configurable_document_types/topical_event.json b/app/models/configurable_document_types/topical_event.json
@@ -181,7 +181,6 @@
       "enabled": true,
       "usages": {
         "header": {
-          "label": "header image",
           "kinds": ["topical_event_header"],
           "multiple": false,
           "caption_enabled": true
diff --git a/app/models/configurable_document_types/world_news_story.json b/app/models/configurable_document_types/world_news_story.json
@@ -100,7 +100,6 @@
           "caption_enabled": true
         },
         "lead": {
-          "label": "lead",
           "kinds": ["default"],
           "multiple": false,
           "caption_enabled": true
diff --git a/app/models/image_usage.rb b/app/models/image_usage.rb
@@ -21,4 +21,10 @@ def embeddable?
   def lead?
     key == "lead"
   end
+
+  def title
+    return "image" if embeddable?
+
+    label || "#{key} image"
+  end
 end
diff --git a/app/views/admin/edition_images/new.html.erb b/app/views/admin/edition_images/new.html.erb
@@ -1,6 +1,6 @@
 <% content_for :context, "#{@edition.title}" %>
-<% content_for :page_title, "New #{@image_usage.label} image for #{@edition.format_name}" %>
-<% content_for :title, "New #{@image_usage.label} image for #{@edition.format_name}" %>
+<% content_for :page_title, "New #{@image_usage.title} for #{@edition.format_name}" %>
+<% content_for :title, "New #{@image_usage.title} for #{@edition.format_name}" %>
 <% content_for :error_summary, render(Admin::ErrorSummaryComponent.new(object: @images.flat_map { |image| image&.errors&.errors }, parent_class: "edition_images")) if @images.present? %>
 
 <div class="govuk-grid-row">
diff --git a/lib/patches/string.rb b/lib/patches/string.rb
@@ -11,4 +11,8 @@ def possessive
       "#{self}’s"
     end
   end
+
+  def articleize
+    %w[a e i o u].include?(self[0].downcase) ? "an #{self}" : "a #{self}"
+  end
 end
diff --git a/test/unit/app/models/image_usage_test.rb b/test/unit/app/models/image_usage_test.rb
@@ -15,4 +15,19 @@ class ImageUsageTest < ActiveSupport::TestCase
     usage = ImageUsage.new(key: "header", kinds: [], multiple: false, caption_enabled: true)
     assert usage.caption_enabled?
   end
+
+  test "default title is \"`key` image\"" do
+    usage = ImageUsage.new(key: "header", kinds: [], multiple: false, caption_enabled: true)
+    assert_equal "header image", usage.title
+  end
+
+  test "title uses label as override if provided" do
+    usage = ImageUsage.new(key: "logo", label: "header logo", kinds: [], multiple: false, caption_enabled: true)
+    assert_equal "header logo", usage.title
+  end
+
+  test "title is `image` if embeddable (default) image usage" do
+    usage = ImageUsage.new(key: "govspeak_embed", kinds: [], multiple: false, caption_enabled: true)
+    assert_equal "image", usage.title
+  end
 end
diff --git a/test/unit/lib/patches/string.rb b/test/unit/lib/patches/string.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class StringTest < ActiveSupport::TestCase
+  test "`articleize` uses correct `article` for a given word" do
+    assert_equal "an apple", "apple".articleize
+    assert_equal "a banana", "banana".articleize
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<%= render "govuk_publishing_components/components/summary_card", {`
`2`	`2`	`id: "uploaded_#{image_usage.key}_image_card",`
`3`		`- title: image_usage.label&.titleize \|\| image_usage.key.titleize,`
`4`	`3`	`summary_card_actions: summary_card_actions,`
	`4`	`+ title: image_usage.title.upcase_first,`
`5`	`5`	`rows: [`
`6`	`6`	`{`
`7`	`7`	`key: "Image",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`<%= render "govuk_publishing_components/components/summary_card", {`
`8`	`8`	`id: "uploaded_#{image_usage.key}_image_card",`
`9`		`- title: image_usage.label&.titleize \|\| image_usage.key.titleize,`
	`9`	`+ title: image_usage.title.upcase_first,`
`10`	`10`	`summary_card_actions: summary_card_actions,`
`11`	`11`	`rows: [`
`12`	`12`	`{`