-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HIPP-1533 - Add RequestProductionAccessSelectApis page
- Loading branch information
1 parent
d05a927
commit 86800d4
Showing
17 changed files
with
767 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
app/controllers/application/RequestProductionAccessSelectApisController.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
/* | ||
* Copyright 2024 HM Revenue & Customs | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package controllers.application | ||
|
||
import controllers.actions.* | ||
import controllers.helpers.{ApplicationApiBuilder, ErrorResultBuilder} | ||
import controllers.routes | ||
import forms.application.RequestProductionAccessSelectApisFormProvider | ||
import models.requests.DataRequest | ||
import models.{Mode, NormalMode} | ||
import navigation.Navigator | ||
import pages.AccessRequestApplicationIdPage | ||
import pages.application.accessrequest.RequestProductionAccessSelectApisPage | ||
import play.api.i18n.{I18nSupport, MessagesApi} | ||
import play.api.mvc.{Action, AnyContent, MessagesControllerComponents, Result} | ||
import repositories.AccessRequestSessionRepository | ||
import services.ApiHubService | ||
import uk.gov.hmrc.http.HeaderCarrier | ||
import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController | ||
import viewmodels.application.ApplicationApi | ||
import views.html.application.RequestProductionAccessSelectApisView | ||
|
||
import javax.inject.Inject | ||
import scala.concurrent.{ExecutionContext, Future} | ||
|
||
class RequestProductionAccessSelectApisController @Inject()( | ||
override val messagesApi: MessagesApi, | ||
sessionRepository: AccessRequestSessionRepository, | ||
navigator: Navigator, | ||
identify: IdentifierAction, | ||
getData: AccessRequestDataRetrievalAction, | ||
requireData: DataRequiredAction, | ||
formProvider: RequestProductionAccessSelectApisFormProvider, | ||
val controllerComponents: MessagesControllerComponents, | ||
view: RequestProductionAccessSelectApisView, | ||
applicationApiBuilder: ApplicationApiBuilder, | ||
apiHubService: ApiHubService, | ||
errorResultBuilder: ErrorResultBuilder, | ||
)(implicit ec: ExecutionContext) extends FrontendBaseController with I18nSupport: | ||
|
||
|
||
def onPageLoad(mode: Mode): Action[AnyContent] = (identify andThen getData andThen requireData).async { | ||
implicit request => | ||
viewWithApiApplications( | ||
mode, | ||
(applicationApis: Seq[ApplicationApi], applicationApisPendingRequest: Seq[ApplicationApi]) => | ||
Future.successful(Ok(view(preparedForm(applicationApis), mode, applicationApis, applicationApisPendingRequest))) | ||
) | ||
} | ||
|
||
def onSubmit(mode: Mode): Action[AnyContent] = (identify andThen getData andThen requireData).async { | ||
implicit request => | ||
|
||
viewWithApiApplications( | ||
mode, | ||
(applicationApis: Seq[ApplicationApi], applicationApisPendingRequest: Seq[ApplicationApi]) => | ||
formProvider(applicationApis.toSet).bindFromRequest().fold( | ||
formWithErrors => | ||
Future.successful(BadRequest(view(formWithErrors, mode, applicationApis, applicationApisPendingRequest))), | ||
|
||
selectedApiIds => | ||
for { | ||
updatedAnswers <- Future.fromTry(request.userAnswers.set(RequestProductionAccessSelectApisPage, selectedApiIds)) | ||
_ <- sessionRepository.set(updatedAnswers) | ||
} yield Redirect(navigator.nextPage(RequestProductionAccessSelectApisPage, mode, updatedAnswers)) | ||
) | ||
) | ||
} | ||
|
||
private def partitionApplicationApis(applicationApis: Seq[ApplicationApi]): (Seq[ApplicationApi], Seq[ApplicationApi]) = | ||
val (applicationApisPendingRequest, applicationApisNoPendingRequest) = applicationApis.partition(_.hasPendingAccessRequest) | ||
val applicationsThatCanRequestAccess = applicationApisNoPendingRequest.filter(api => !api.isMissing && api.needsProductionAccessRequest) | ||
(applicationsThatCanRequestAccess, applicationApisPendingRequest) | ||
|
||
private def preparedForm(applicationApis: Seq[ApplicationApi])(implicit request: DataRequest[?]) = | ||
val form = formProvider(applicationApis.toSet) | ||
request.userAnswers.get(RequestProductionAccessSelectApisPage) match { | ||
case None => form | ||
case Some(value) => form.fill(value) | ||
} | ||
|
||
private def viewWithApiApplications( | ||
mode: Mode, | ||
result: ( | ||
applicationApis: Seq[ApplicationApi], | ||
applicationApisPendingRequests: Seq[ApplicationApi] | ||
) => Future[Result] | ||
)(implicit hc: HeaderCarrier, request: DataRequest[?]): Future[Result] = | ||
request.userAnswers.get(AccessRequestApplicationIdPage) match { | ||
case Some(application) => | ||
applicationApiBuilder.build(application).flatMap(apis => result.tupled(partitionApplicationApis(apis))) | ||
case _ => Future.successful(Redirect(routes.JourneyRecoveryController.onPageLoad())) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
app/forms/application/RequestProductionAccessSelectApisFormProvider.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
* Copyright 2024 HM Revenue & Customs | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package forms.application | ||
|
||
import forms.mappings.Mappings | ||
import models.{AvailableEndpoints, Enumerable} | ||
import play.api.data.Form | ||
import play.api.data.Forms.set | ||
import viewmodels.application.ApplicationApi | ||
|
||
import javax.inject.Inject | ||
|
||
class RequestProductionAccessSelectApisFormProvider @Inject() extends Mappings { | ||
|
||
def apply(applicationAPIs: Set[ApplicationApi]): Form[Set[String]] = | ||
val validApplicationAPIs = applicationAPIs.filterNot(_.isMissing) | ||
|
||
given enumerableScopes: Enumerable[String] = (str: String) => { | ||
validApplicationAPIs.collectFirst { case api if api.apiId == str => api.apiId } | ||
} | ||
|
||
Form( | ||
"value" -> set(enumerable[String]("requestProductionAccessSelectApis.error.required")) | ||
.verifying(nonEmptySet("requestProductionAccessSelectApis.error.required")) | ||
) | ||
} |
27 changes: 27 additions & 0 deletions
27
app/pages/application/accessrequest/RequestProductionAccessSelectApisPage.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
* Copyright 2024 HM Revenue & Customs | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package pages.application.accessrequest | ||
|
||
import pages.QuestionPage | ||
import play.api.libs.json.JsPath | ||
|
||
case object RequestProductionAccessSelectApisPage extends QuestionPage[Set[String]] { | ||
|
||
override def path: JsPath = JsPath \ toString | ||
|
||
override def toString: String = "requestProductionAccessSelectApis" | ||
} |
53 changes: 53 additions & 0 deletions
53
...els/checkAnswers/application/accessrequest/RequestProductionAccessSelectApisSummary.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright 2024 HM Revenue & Customs | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package viewmodels.checkAnswers.application.accessrequest | ||
|
||
import controllers.application.routes | ||
import models.{CheckMode, UserAnswers} | ||
import pages.application.accessrequest.RequestProductionAccessSelectApisPage | ||
import play.api.i18n.Messages | ||
import play.twirl.api.HtmlFormat | ||
import uk.gov.hmrc.govukfrontend.views.viewmodels.content.HtmlContent | ||
import uk.gov.hmrc.govukfrontend.views.viewmodels.summarylist.SummaryListRow | ||
import viewmodels.govuk.summarylist.* | ||
import viewmodels.implicits.* | ||
|
||
object RequestProductionAccessSelectApisSummary { | ||
|
||
def row(answers: UserAnswers)(implicit messages: Messages): Option[SummaryListRow] = | ||
answers.get(RequestProductionAccessSelectApisPage).map { | ||
answers => | ||
|
||
val value = ValueViewModel( | ||
HtmlContent( | ||
answers.map { | ||
answer => HtmlFormat.escape(messages(s"requestProductionAccessSelectApis.$answer")).toString | ||
} | ||
.mkString(",<br>") | ||
) | ||
) | ||
|
||
SummaryListRowViewModel( | ||
key = "requestProductionAccessSelectApis.checkYourAnswersLabel", | ||
value = value, | ||
actions = Seq( | ||
ActionItemViewModel("site.change", routes.RequestProductionAccessSelectApisController.onPageLoad(CheckMode).url) | ||
.withVisuallyHiddenText(messages("requestProductionAccessSelectApis.change.hidden")) | ||
) | ||
) | ||
} | ||
} |
85 changes: 85 additions & 0 deletions
85
app/views/application/RequestProductionAccessSelectApisView.scala.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
@* | ||
* Copyright 2024 HM Revenue & Customs | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*@ | ||
|
||
@import viewmodels.application.ApplicationApi | ||
|
||
@this( | ||
layout: templates.Layout, | ||
formHelper: FormWithCSRF, | ||
govukErrorSummary: GovukErrorSummary, | ||
govukCheckboxes: GovukCheckboxes, | ||
govukButton: GovukButton, | ||
govukWarningText: GovukWarningText | ||
) | ||
|
||
@(form: Form[?], mode: Mode, applicationApis: Seq[ApplicationApi], applicationApisPendingRequest: Seq[ApplicationApi])(implicit request: Request[?], messages: Messages) | ||
|
||
@pendingRequestsContent() = { | ||
<p class="govuk-body"> | ||
<strong class="govuk-warning-text__text "> | ||
@messages("requestProductionAccessSelectApis.pendingRequests.heading") | ||
</strong> | ||
<ul class="hip-warning-list"> | ||
@applicationApisPendingRequest.map(applicationApi => | ||
<li> | ||
{applicationApi.apiTitle} | ||
</li> | ||
) | ||
</ul> | ||
</p> | ||
} | ||
|
||
@layout(pageTitle = title(form, messages("requestProductionAccessSelectApis.title")), fullWidth = true) { | ||
|
||
@formHelper(action = controllers.application.routes.RequestProductionAccessSelectApisController.onSubmit(mode), Symbol("autoComplete") -> "off") { | ||
|
||
@if(form.errors.nonEmpty) { | ||
@govukErrorSummary(ErrorSummaryViewModel(form, errorLinkOverrides = Map("value" -> "value_0"))) | ||
} | ||
|
||
<h1 class="govuk-heading-xl"> | ||
@messages("requestProductionAccessSelectApis.heading") | ||
</h1> | ||
|
||
@if(applicationApisPendingRequest.nonEmpty){ | ||
@govukWarningText(WarningText( | ||
iconFallbackText = Some("Warning"), | ||
content = HtmlContent(pendingRequestsContent()), | ||
classes = "hip-warning-text" | ||
)) | ||
} | ||
|
||
@govukCheckboxes( | ||
CheckboxesViewModel( | ||
form = form, | ||
name = "value", | ||
legend = Legend(), | ||
items = applicationApis.zipWithIndex.map { case (applicationApi, index) => | ||
CheckboxItemViewModel( | ||
content = Text(applicationApi.apiTitle), | ||
fieldId = "value", | ||
index = index, | ||
value = applicationApi.apiId | ||
) | ||
} | ||
) | ||
) | ||
|
||
@govukButton( | ||
ButtonViewModel(messages("site.continue")) | ||
) | ||
} | ||
} |
Oops, something went wrong.