Skip to content

Commit 2c3e076

Browse files
committed
BDOG-237 Display source of outage page template
1 parent f738afb commit 2c3e076

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

app/uk/gov/hmrc/cataloguefrontend/shuttering/ShutterServiceController.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,17 @@ class ShutterServiceController @Inject()(
140140
.outagePageByAppAndEnv(serviceName, step1Out.env)
141141
).map(_.collect { case Some(op) => op })
142142
outageMessageTemplate = outagePages
143-
.flatMap(_.templatedMessages)
143+
.flatMap(op => op.templatedMessages.map((op, _)))
144144
.headOption
145145
requiresOutageMessage = outageMessageTemplate.isDefined || outagePages.flatMap(_.warnings).nonEmpty
146-
defaultOutageMessage = outageMessageTemplate.fold("")(_.innerHtml)
146+
outageMessageSrc = outageMessageTemplate.map(_._1)
147+
defaultOutageMessage = outageMessageTemplate.fold("")(_._2.innerHtml)
147148
outagePageStatus = shutterService.toOutagePageStatus(step1Out.serviceNames, outagePages)
148149
form2 = step2Form.fill {
149150
val s2f = form.get
150151
if (s2f.outageMessage.isEmpty) s2f.copy(outageMessage = defaultOutageMessage) else s2f
151152
}
152-
} yield page2(form2, step1Out, requiresOutageMessage, defaultOutageMessage, outagePageStatus)
153+
} yield page2(form2, step1Out, requiresOutageMessage, outageMessageSrc, defaultOutageMessage, outagePageStatus)
153154

154155

155156
def step2Get =

app/views/shuttering/shutterService/Page2.scala.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*@
1616

1717
@import uk.gov.hmrc.cataloguefrontend.ViewMessages
18-
@import uk.gov.hmrc.cataloguefrontend.shuttering.{Environment, OutagePageStatus, ShutterStatusValue, ShutterState}
18+
@import uk.gov.hmrc.cataloguefrontend.shuttering.{Environment, OutagePage, OutagePageStatus, ShutterStatusValue, ShutterState}
1919
@import uk.gov.hmrc.cataloguefrontend.shuttering.ShutterServiceController.{Step1Out, Step2Form}
2020
@import helper._
2121

@@ -24,6 +24,7 @@
2424
@( form : Form[Step2Form]
2525
, step1Out : Step1Out
2626
, requiresOutageMessage : Boolean
27+
, outageMessageSrc : Option[OutagePage]
2728
, defaultOutageMessage : String
2829
, outagePages : Seq[OutagePageStatus]
2930
)(implicit request : Request[_]
@@ -124,6 +125,7 @@ <h1>Shutter Service</h1>
124125
, 'rows -> 5
125126
, 'cols -> 60
126127
)
128+
<p>@Html(outageMessageSrc.map(src => s"The templated value was extracted from the <a target='_blank' href='${src.outagePageURL}'>${src.serviceName} outage page</a>.").getOrElse(""))</p>
127129
</div>
128130
<div class="col-sm-4" style="display:table-cell; float:none; vertical-align: middle;">
129131
<a id="back-btn" href="javascript:revertTemplate()" class="btn btn-default">

0 commit comments

Comments
 (0)