Skip to content

Commit

Permalink
PLATUI-2709: Adding missing aliase for AddToAList, amended List to Se…
Browse files Browse the repository at this point in the history
…q for consistency in TaskList (#286)
  • Loading branch information
JoPintoPaul committed Mar 19, 2024
1 parent 3d0f831 commit 845e2e6
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Expand Up @@ -8,11 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
For compatibility information see `govukFrontendVersion` and `hmrcFrontendVersion` in
[LibDependencies](project/LibDependencies.scala)

## [9.1.0] - 2024-03-14
## [9.1.0] - 2024-03-19

### Changed

- Updated README with guidance on adding fixtures to the excluded-fixtures folder.
- Updated `TaskList` viewmodel, updated missing Aliases

### Compatible with

Expand Down
Expand Up @@ -21,7 +21,7 @@ import play.api.libs.json._
import uk.gov.hmrc.govukfrontend.views.viewmodels.CommonJsonFormats._

case class TaskList(
items: List[TaskListItem] = List.empty,
items: Seq[TaskListItem] = Seq.empty,
classes: String = "",
attributes: Map[String, String] = Map.empty,
idPrefix: String = ""
Expand All @@ -33,15 +33,15 @@ object TaskList {

implicit def jsonReads: Reads[TaskList] =
(
(__ \ "items").readWithDefault[List[TaskListItem]](defaultObject.items) and
(__ \ "items").readWithDefault[Seq[TaskListItem]](defaultObject.items) and
(__ \ "classes").readWithDefault[String](defaultObject.classes) and
(__ \ "attributes").readWithDefault[Map[String, String]](defaultObject.attributes)(attributesReads) and
(__ \ "idPrefix").readWithDefault[String](defaultObject.idPrefix)
)(TaskList.apply _)

implicit def jsonWrites: OWrites[TaskList] =
(
(__ \ "items").write[List[TaskListItem]] and
(__ \ "items").write[Seq[TaskListItem]] and
(__ \ "classes").write[String] and
(__ \ "attributes").write[Map[String, String]] and
(__ \ "idPrefix").write[String]
Expand Down
Expand Up @@ -102,6 +102,12 @@ trait Aliases {
type AddToAList = viewmodels.addtoalist.AddToAList
val AddToAList = viewmodels.addtoalist.AddToAList

type ListItem = viewmodels.addtoalist.ListItem
val ListItem = viewmodels.addtoalist.ListItem

type ItemType = viewmodels.addtoalist.ItemType
val ItemType = viewmodels.addtoalist.ItemType

type Timeline = viewmodels.timeline.Timeline
val Timeline = viewmodels.timeline.Timeline

Expand Down

0 comments on commit 845e2e6

Please sign in to comment.