Merge pull request #433 from hmrc/DL-13828-2

DL-13828-2: upgraded play-frontend-hmrc to 10.1.0
hmrc · Jun 18, 2024 · be68652 · be68652
2 parents 27aa9e7 + 6a734f9
commit be68652
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 67 deletions.
diff --git a/app/views/editLiability/bankDetails.scala.html b/app/views/editLiability/bankDetails.scala.html
@@ -163,7 +163,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-3">
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
     }
 

diff --git a/app/views/editLiability/dataOfDisposal.scala.html b/app/views/editLiability/dataOfDisposal.scala.html
@@ -37,13 +37,6 @@
         request: Request[AnyContent],
         appConfig: ApplicationConfig)
 
-@dateItems = @{
-    Seq(InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "4"))
-    )
-}
-
 @backLinkHtml = {
     @if(backLink.isDefined) {
         @govukBackLink(BackLink(
@@ -67,16 +60,15 @@
             hint = Some(Hint(
                 content = Text(messages("ated.date.hint"))
             )),
-            items = dateItems
-            ).withFormField(disposeLiabilityForm("dateOfDisposal"))
+            ).withDayMonthYearFormField(disposeLiabilityForm("dateOfDisposal"))
             .withHeadingAndSectionCaption(
                 heading = Text(messages("ated.dispose-property.disposal-date.header")),
                 sectionCaption = Text(messages("ated.property-details.pre-header-dispose"))
         ))
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
         <input type="hidden" name="periodKey" id="id" value=@disposeLiabilityForm("periodKey").value>
     }

diff --git a/app/views/editLiability/disposeLiabilityBankDetails.scala.html b/app/views/editLiability/disposeLiabilityBankDetails.scala.html
@@ -166,7 +166,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-3">
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
     }
 

diff --git a/app/views/editLiability/disposeLiabilityDeclaration.scala.html b/app/views/editLiability/disposeLiabilityDeclaration.scala.html
@@ -81,7 +81,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
     @formHelper(action = controllers.editLiability.routes.DisposeLiabilityDeclarationController.submit(oldFormBundleNum)) {
         @govukButton(Button(
             content = Text(messages("ated.edit-liability.declaration.submit.amend")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
     }
 }
diff --git a/app/views/editLiability/disposeLiabilityHasBankDetails.scala.html b/app/views/editLiability/disposeLiabilityHasBankDetails.scala.html
@@ -77,7 +77,7 @@
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
     }
 

diff --git a/app/views/editLiability/disposeLiabilitySummary.scala.html b/app/views/editLiability/disposeLiabilitySummary.scala.html
@@ -465,7 +465,7 @@ <h2 id="return-status-header" class="govuk-heading-m govuk-!-padding-bottom-4">@
     @formHelper(action = controllers.editLiability.routes.DisposeLiabilitySummaryController.submit(disposeLiability.id.toString)) {
       @govukButton(Button(
         content = Text(messages("ated.confirm-and-continue")),
-        attributes = Map("type" -> "submit", "id" -> "submit")
+        attributes = Map("id" -> "submit")
       ))
     }
   }

diff --git a/app/views/editLiability/editLiability.scala.html b/app/views/editLiability/editLiability.scala.html
@@ -75,7 +75,7 @@
 
             @govukButton(Button(
                 content = Text(messages("ated.save-and-continue")),
-                attributes = Map("type" -> "submit", "id" -> "submit")
+                attributes = Map("id" -> "submit")
             ))
         } else {
 
@@ -102,7 +102,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
 
             @govukButton(Button(
                 content = Text(messages("ated.edit-liability.return-type.no-edit-legend4")),
-                attributes = Map("type" -> "submit", "id" -> "reportDisposeLink")
+                attributes = Map("id" -> "reportDisposeLink")
             ))
         }
     }

diff --git a/app/views/editLiability/editLiabilityDatesLiable.scala.html b/app/views/editLiability/editLiabilityDatesLiable.scala.html
@@ -94,7 +94,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
 
     }

diff --git a/app/views/editLiability/editLiabilityDeclaration.scala.html b/app/views/editLiability/editLiabilityDeclaration.scala.html
@@ -83,7 +83,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
     @formHelper(action = controllers.editLiability.routes.EditLiabilityDeclarationController.submit(oldFormBundleNum)) {
         @govukButton(Button(
             content = Text(messages(printSubmitMsg(returnType))),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
     }
 }
diff --git a/app/views/editLiability/editLiabilityHasValueChanged.scala.html b/app/views/editLiability/editLiabilityHasValueChanged.scala.html
@@ -102,7 +102,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
     }
 

diff --git a/app/views/editLiability/editLiabilitySummary.scala.html b/app/views/editLiability/editLiabilitySummary.scala.html
@@ -546,7 +546,7 @@ <h2 id="return-status-header" class="govuk-heading-m govuk-!-padding-bottom-4">@
 
     @govukButton(Button(
       content = Text(messages("ated.continue")),
-      attributes = Map("type" -> "submit", "id" -> "submit")
+      attributes = Map("id" -> "submit")
     ))
 
   }

diff --git a/app/views/editLiability/hasBankDetails.scala.html b/app/views/editLiability/hasBankDetails.scala.html
@@ -98,7 +98,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),
-            attributes = Map("type" -> "submit", "id" -> "submit")
+            attributes = Map("id" -> "submit")
         ))
     }
 }
diff --git a/app/views/propertyDetails/dateCouncilRegistered.scala.html b/app/views/propertyDetails/dateCouncilRegistered.scala.html
@@ -34,13 +34,6 @@
 
 @(id: String, periodKey: Int, propertyDetailsForm: Form[DateCouncilRegistered], mode: Option[String], serviceInfoContent: Html = HtmlFormat.empty, backLink: Option[String])(implicit authContext: StandardAuthRetrievals, messages: Messages, request: Request[AnyContent], appConfig: ApplicationConfig)
 
-@dateItems = @{
-    Seq(InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "4"))
-    )
-}
-
 @backLinkHtml = {
     @if(backLink.isDefined) {
         @govukBackLink(BackLink(
@@ -84,8 +77,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
                 classes = "govuk-visually-hidden"
               ))
             )),
-            items = dateItems
-        ).withFormField(propertyDetailsForm("dateCouncilRegistered")))
+        ).withDayMonthYearFormField(propertyDetailsForm("dateCouncilRegistered")))
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),

diff --git a/app/views/propertyDetails/dateCouncilRegisteredKnown.scala.html b/app/views/propertyDetails/dateCouncilRegisteredKnown.scala.html
@@ -66,7 +66,6 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
   @formHelper(action = controllers.propertyDetails.routes.DateCouncilRegisteredKnownController.save(id, mode)) {
 
     @govukRadios(Radios(
-      classes = "govuk-radios--inline",
       fieldset = Some(Fieldset(
           legend = Some(Legend(
               content = Text(messages("ated.property-details.council-registered-known.header")),
@@ -79,7 +78,8 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
               value = Some("true")),
           RadioItem(
               content = Text(messages("ated.property-details-value.no")),
-              value = Some("false")))
+              value = Some("false"))),
+        classes = "govuk-radios--inline"
       ).withFormField(dateCouncilRegisteredKnownForm("isDateCouncilRegisteredKnown"))
     )
 

diff --git a/app/views/propertyDetails/dateFirstOccupied.scala.html b/app/views/propertyDetails/dateFirstOccupied.scala.html
@@ -34,13 +34,6 @@
 
 @(id: String, periodKey: Int, propertyDetailsForm: Form[DateFirstOccupied], mode: Option[String], serviceInfoContent: Html = HtmlFormat.empty, backLink: Option[String])(implicit authContext: StandardAuthRetrievals, messages: Messages, request: Request[AnyContent], appConfig: ApplicationConfig)
 
-@dateItems = @{
-    Seq(InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "4"))
-    )
-}
-
 @backLinkHtml = {
     @if(backLink.isDefined) {
         @govukBackLink(BackLink(
@@ -84,8 +77,7 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
                 classes = "govuk-visually-hidden"
               ))
             )),
-            items = dateItems
-        ).withFormField(propertyDetailsForm("dateFirstOccupied")))
+        ).withDayMonthYearFormField(propertyDetailsForm("dateFirstOccupied")))
 
         @govukButton(Button(
             content = Text(messages("ated.save-and-continue")),

diff --git a/app/views/propertyDetails/dateFirstOccupiedKnown.scala.html b/app/views/propertyDetails/dateFirstOccupiedKnown.scala.html
@@ -66,7 +66,6 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
   @formHelper(action = controllers.propertyDetails.routes.DateFirstOccupiedKnownController.save(id, mode)) {
 
     @govukRadios(Radios(
-      classes = "govuk-radios--inline",
       fieldset = Some(Fieldset(
           legend = Some(Legend(
               content = Text(messages("ated.property-details.first-occupied-known.header")),
@@ -79,7 +78,8 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
               value = Some("true")),
           RadioItem(
               content = Text(messages("ated.property-details-value.no")),
-              value = Some("false")))
+              value = Some("false"))),
+      classes = "govuk-radios--inline"
       ).withFormField(dateFirstOccupiedKnownForm("isDateFirstOccupiedKnown"))
     )
 

diff --git a/app/views/propertyDetails/propertyDetailsRevalued.scala.html b/app/views/propertyDetails/propertyDetailsRevalued.scala.html
@@ -46,25 +46,17 @@
     }
 }
 
-@dateItems = @{
-    Seq(InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "4"))
-    )
-}
-
 @conditionalYes = {
     @govukDateInput(DateInput(
         hint = Some(Hint(
             content = Text(messages("ated.property-details-value.partAcqDispDate.hint", PeriodUtils.periodEndDate(periodKey).toString(messages("ated.date-format.numeric"))))
         )),
-        items = dateItems,
         fieldset = Some(Fieldset(
             legend = Some(Legend(
             content = Text(messages("ated.property-details-value.partAcqDispDate"))
             ))
         ))
-    ).withFormField(propertyDetailsForm("partAcqDispDate")))
+    ).withDayMonthYearFormField(propertyDetailsForm("partAcqDispDate")))
 
     @govukInput(Input(
         classes = "govuk-input--width-10",
@@ -83,13 +75,12 @@
         hint = Some(Hint(
             content = Text(messages("ated.property-details-value.revaluedDate.hint", PeriodUtils.periodEndDate(periodKey).toString(messages("ated.date-format.numeric"))))
         )),
-        items = dateItems,
         fieldset = Some(Fieldset(
             legend = Some(Legend(
             content = Text(messages("ated.property-details-value.revaluedDate"))
             ))
         ))
-    ).withFormField(propertyDetailsForm("revaluedDate")))
+    ).withDayMonthYearFormField(propertyDetailsForm("revaluedDate")))
 
 }
 

diff --git a/app/views/propertyDetails/propertyDetailsWhenAcquired.scala.html b/app/views/propertyDetails/propertyDetailsWhenAcquired.scala.html
@@ -41,13 +41,6 @@
     }
 }
 
-@dateItems = @{
-    Seq(InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "2")),
-        InputItem(attributes = Map("maxLength" -> "4"))
-    )
-}
-
 @newMain(title = titleBuilder(messages("ated.property-details-value.whenAcquired.title"), Some(propertyDetailsForm)),
 serviceInfoContent = serviceInfoContent) {
 
@@ -63,8 +56,7 @@
             hint = Some(Hint(
               content = Text(messages("ated.property-details-value.newBuildDates.exampleDate"))
             )),
-            items = dateItems
-        ).withFormField(propertyDetailsForm("acquiredDate"))
+        ).withDayMonthYearFormField(propertyDetailsForm("acquiredDate"))
         .withHeadingAndSectionCaption(
             heading = Text(messages("ated.property-details-value.whenAcquired.header", PeriodUtils.calculateLowerTaxYearBoundary(periodKey).getYear.toString)),
             sectionCaption = Text(messages(AtedUtils.getPropertyDetailsPreHeader(mode)))

diff --git a/app/views/reliefs/avoidanceSchemeBeingUsed.scala.html b/app/views/reliefs/avoidanceSchemeBeingUsed.scala.html
@@ -95,7 +95,6 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
     @govukRadios(
         Radios(
             fieldset = Some(Fieldset(
-                classes = "govuk-radios--inline",
                     legend = Some(Legend(
                         content = Text(messages("ated.choose-reliefs.avoidance-title")),
                         classes = "govuk-visually-hidden"
@@ -111,7 +110,8 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">
                         value = Some("false")
                     )
                 ),
-                errorMessage = if(isTaxAvoidanceForm.hasErrors) Some(ErrorMessage(content = Text(messages(isTaxAvoidanceForm.errors.map(e => e.message))))) else None
+                errorMessage = if(isTaxAvoidanceForm.hasErrors) Some(ErrorMessage(content = Text(messages(isTaxAvoidanceForm.errors.map(e => e.message))))) else None,
+        classes = "govuk-radios--inline",
         ).withFormField(isTaxAvoidanceForm("isAvoidanceScheme")))
 
     <div class="govuk-form-group">

diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -12,7 +12,7 @@ object AppDependencies {
     "uk.gov.hmrc" %% "play-partials-play-30"       % "9.1.0",
     "uk.gov.hmrc" %% "domain-play-30"              % "9.0.0",
     "uk.gov.hmrc" %% "http-caching-client-play-30" % "11.2.0",
-    "uk.gov.hmrc" %% "play-frontend-hmrc-play-30"  % "9.11.0"
+    "uk.gov.hmrc" %% "play-frontend-hmrc-play-30"  % "10.1.0"
   )
 
   val test: Seq[ModuleID] = Seq(