Skip to content

Add variant parameter to ImageProcessingChecker #11454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patrickpatrickpatrick wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −4
Open

Add variant parameter to ImageProcessingChecker #11454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/assets/javascripts/admin/modules/image-processing-checker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}
constructor($root) {
this.$root = $root
this.imageLink = this.$root.dataset.imageLink
this.variant = this.$root.dataset.variant || 'original'

this.timeoutDuration =
parseInt(this.$root.dataset.timeoutDuration, 10) ||
Expand Down Expand Up @@ -95,13 +96,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}

if (imgElement) {
const previewAsset = assets.find(
({ variant }) => variant !== 'original'
({ variant }) => variant === this.variant
)

// images with multiple assets can have
// transformed variants so we should not use
// the `original` asset if this is the case
imgElement.src = previewAsset ? previewAsset.url : assets[0].url
imgElement.src = previewAsset.url
Copy link
Copy Markdown
Contributor

@ChrisBAshton ChrisBAshton May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the comment above this need deleting / editing now?

}

this.updateImageStatus(this.imagePreview)
Expand Down
2 changes: 1 addition & 1 deletion app/components/admin/edition_images/image_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<li data-module="image-processing-checker" data-image-link="<%= admin_edition_image_path(edition, image) %>" class="govuk-grid-row">
<li data-module="image-processing-checker" data-image-link="<%= admin_edition_image_path(edition, image) %>" data-variant="s960" class="govuk-grid-row">
<template class="js-image-preview">
<div class="govuk-grid-column-one-third">
<img src="" alt="" class="app-view-edition-resource__preview">
Expand Down
23 changes: 22 additions & 1 deletion spec/javascripts/admin/modules/image-processing-checker.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('GOVUK.Modules.ImageProcessingChecker', function () {

afterEach(() => imagePreview.remove())

it('should replace the processing status with the image preview', (done) => {
it('should replace the processing status with the original image', (done) => {
spyOn(window, 'fetch').and.resolveTo(okResponse)
// eslint-disable-next-line no-new
new GOVUK.Modules.ImageProcessingChecker(imagePreview)
Expand All @@ -64,6 +64,27 @@ describe('GOVUK.Modules.ImageProcessingChecker', function () {

window.setTimeout(() => {
expect(imagePreview.querySelector('img'))
expect(imagePreview.querySelector('img').src).toBe(
'http://assets.gov.uk/media/960x640.png'
)
done()
}, imageProcessingTimeout * 2)
})

it('should replace the processing status with a specific image if `variant` specified', (done) => {
imagePreview.dataset.variant = 's960'

spyOn(window, 'fetch').and.resolveTo(okResponse)
// eslint-disable-next-line no-new
new GOVUK.Modules.ImageProcessingChecker(imagePreview)

expect(imagePreview.querySelector('img')).toBe(null)

window.setTimeout(() => {
expect(imagePreview.querySelector('img'))
expect(imagePreview.querySelector('img').src).toBe(
'http://assets.gov.uk/media/s960_960x640.png'
)
done()
}, imageProcessingTimeout * 2)
})
Expand Down