Skip to content
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

Jump to bottom

Add Thumbnail image to DCR model for Audio Articles #27487

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Add Thumbnail image to DCR model for Audio Articles #27487

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
84ac5a8
add thumbnail to audio pages WIP
oliverabrahams Sep 16, 2024
b7ed523
add thumbnail to audio pages WIP
oliverabrahams Sep 17, 2024
44973dc
add thumbnail to audio pages WIP format
oliverabrahams Sep 17, 2024
8749f4b
add thumbnail to audio pages
oliverabrahams Sep 17, 2024
592071d
formatting
oliverabrahams Sep 17, 2024
2d9b05a
changed name of field
oliverabrahams Sep 17, 2024
ef40135
Merge branch 'main' into oa/audio-page-thumbnail-image
oliverabrahams Sep 17, 2024
106be62
changed name of field
oliverabrahams Sep 17, 2024
8a1dc54
Just send the Image Block component
oliverabrahams Sep 17, 2024
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
34 changes: 33 additions & 1 deletion common/app/model/dotcomrendering/DotcomRenderingDataModel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ import conf.Configuration
import crosswords.CrosswordPageWithContent
import experiments.ActiveExperiments
import model.dotcomrendering.DotcomRenderingUtils._
import model.dotcomrendering.pageElements.{PageElement, TextCleaner}
import model.dotcomrendering.pageElements.{ImageBlockElement, PageElement, Role, TextCleaner}
import model.liveblog.BlockAttributes
import model.{
ArticleDateTimes,
Badges,
CanonicalLiveBlog,
ContentFormat,
ContentPage,
CrosswordData,
DotcomContentType,
GUDateTimeFormatNew,
GalleryPage,
ImageContentPage,
Expand Down Expand Up @@ -87,6 +89,7 @@ case class DotcomRenderingDataModel(
commercialProperties: Map[String, EditionCommercialProperties],
pageType: PageType,
starRating: Option[Int],
audioArticleImage: Option[ImageBlockElement],
trailText: String,
nav: Nav,
showBottomSocialButtons: Boolean,
Expand Down Expand Up @@ -164,6 +167,7 @@ object DotcomRenderingDataModel {
"commercialProperties" -> model.commercialProperties,
"pageType" -> model.pageType,
"starRating" -> model.starRating,
"audioArticleImage" -> model.audioArticleImage,
"trailText" -> model.trailText,
"nav" -> model.nav,
"showBottomSocialButtons" -> model.showBottomSocialButtons,
Expand Down Expand Up @@ -500,6 +504,33 @@ object DotcomRenderingDataModel {

val dcrTags = content.tags.tags.map(Tag.apply)

val audioImageBlock: Option[ImageBlockElement] =
if (page.metadata.contentType.contains(DotcomContentType.Audio)) {
for {
thumbnail <- page.item.elements.thumbnail
} yield {
val imageData = thumbnail.images.allImages.headOption
.map { d =>
Map(
"copyright" -> "",
"alt" -> d.altText.getOrElse(""),
"caption" -> d.caption.getOrElse(""),
"credit" -> d.credit.getOrElse(""),
)
}
.getOrElse(Map.empty)
ImageBlockElement(
thumbnail.images,
imageData,
Some(true),
Role(Some("inline")),
Seq.empty,
)
}
} else {
None
}

def toDCRBlock(isMainBlock: Boolean = false) = { block: APIBlock =>
Block(
block = block,
Expand Down Expand Up @@ -565,6 +596,7 @@ object DotcomRenderingDataModel {

DotcomRenderingDataModel(
affiliateLinksDisclaimer = addAffiliateLinksDisclaimerDCR(shouldAddAffiliateLinks, shouldAddDisclaimer),
audioArticleImage = audioImageBlock,
author = author,
badge = Badges.badgeFor(content).map(badge => DCRBadge(badge.seriesTag, badge.imageUrl)),
beaconURL = Configuration.debug.beaconUrl,
Expand Down
Loading