Skip to content

Commit 66ad3a6

Browse files
committed
minimum necessary changes to get tag combiner pages running in DCR
1 parent b42d87f commit 66ad3a6

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

applications/conf/routes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ GET /$path<[\w\d-]*(/[\w\d-]*)?(/[\w\d-]*)?>.json
136136
GET /$path<[\w\d-]*(/[\w\d-]*)?(/[\w\d-]*)?> controllers.IndexController.render(path)
137137

138138
# Tag combiners
139+
GET /$leftSide<[^+]+>+*rightSide.json controllers.IndexController.renderCombiner(leftSide, rightSide)
139140
GET /$leftSide<[^+]+>+*rightSide controllers.IndexController.renderCombiner(leftSide, rightSide)
140141

141142
# Google site verification

common/app/model/meta.scala

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,12 +559,25 @@ case class TagCombiner(
559559

560560
private val webTitle: String = webTitleOverrides.getOrElse(id, s"${leftTag.name} + ${rightTag.name}")
561561

562+
val javascriptConfigOverrides: Map[String, JsValue] = Map(
563+
("keywords", JsString(List(leftTag.properties.webTitle, rightTag.properties.webTitle).mkString(","))),
564+
("keywordIds", JsString(List(leftTag.id, rightTag.id).mkString(","))),
565+
(
566+
"references",
567+
JsArray(
568+
(leftTag.properties.references ++ rightTag.properties.references).map(ref => Reference.toJavaScript(ref.id)),
569+
),
570+
),
571+
)
572+
562573
override val metadata: MetaData = MetaData.make(
563574
id = id,
564575
section = leftTag.metadata.section,
565576
webTitle = webTitle,
566577
pagination = pagination,
567578
description = Some(DotcomContentType.TagIndex.name),
579+
javascriptConfigOverrides = javascriptConfigOverrides,
580+
isFront = true,
568581
commercial = Some(
569582
// We only use the left tag for CommercialProperties
570583
CommercialProperties(

common/app/services/repositories.scala

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,15 @@ trait Index extends ConciergeRepository {
8080
val tag2 = findTag(head.item, secondTag)
8181
if (tag1.isDefined && tag2.isDefined) {
8282
val page = TagCombiner(s"$leftSide+$rightSide", tag1.get, tag2.get, pagination(response))
83-
Right(IndexPage(page, contents = trails, tags = Tags(Nil), date = DateTime.now, tzOverride = None))
83+
Right(
84+
IndexPage(
85+
page,
86+
contents = trails,
87+
tags = Tags(List(tag1.get, tag2.get)),
88+
date = DateTime.now,
89+
tzOverride = None,
90+
),
91+
)
8492
} else {
8593
Left(NotFound)
8694
}

0 commit comments

Comments
 (0)