From 0bf5aa2116f770562bf5b003901d3b7e05250003 Mon Sep 17 00:00:00 2001 From: Mark Kingsbury Date: Wed, 17 Jul 2024 10:35:37 +0100 Subject: [PATCH 1/7] TDRD-352-356:changes to html for standard --- README.md | 2 ++ app/views/partials/progressIndicator.scala.html | 4 +--- app/views/standard/downloadMetadata.scala.html | 16 ++++++---------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 6feaeb501..d3124c1a8 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,12 @@ development environment for the other TDR services. aws ssm get-parameter --name "/intg/keycloak/client/secret" --with-decryption ``` - Copy the `Value` from the object returned + - get arn for the slack notifications SNS topic for integration (find in AWS console) - In IntelliJ, create a new sbt run configuration: - Set the Tasks parameter to `run` - Configure the environment variables: - AUTH_SECRET=\ + - NOTIFICATION_SNS_TOPIC_ARN=\ - Follow the Static Assets steps below to build the CSS and JS - Run the project from IntelliJ - Visit `http://localhost:9000` diff --git a/app/views/partials/progressIndicator.scala.html b/app/views/partials/progressIndicator.scala.html index 192f29b3c..720a87fa7 100644 --- a/app/views/partials/progressIndicator.scala.html +++ b/app/views/partials/progressIndicator.scala.html @@ -1,6 +1,4 @@ @(step: String, isJudgmentUser: Boolean=false)(implicit messages: Messages) @if(isJudgmentUser) { - @Messages("progressIndicator.step", step, Messages("judgmentProgress.totalSteps")) - } else { - @Messages("progressIndicator.step", step, Messages("progress.totalSteps")) + @Messages("progressIndicator.step", step, Messages("judgmentProgress.totalSteps")) } diff --git a/app/views/standard/downloadMetadata.scala.html b/app/views/standard/downloadMetadata.scala.html index e5b34aa9b..8627036ff 100644 --- a/app/views/standard/downloadMetadata.scala.html +++ b/app/views/standard/downloadMetadata.scala.html @@ -1,9 +1,10 @@ @import java.util.UUID @import views.html.partials.{progressIndicator, transferReference} @import views.html.partials.notificationBanner +@import views.html.partials.backLink @(consignmentId: UUID, consignmentRef: String, name: String, blockMetadataReview: Boolean)(implicit messages: Messages, request: RequestHeader) -@main("Download and review metadata", name = name) { +@main("Download and review metadata", name = name, backLink = Some(backLink(routes.AdditionalMetadataEntryMethodController.additionalMetadataEntryMethodPage(consignmentId).url, "Back")) ) { @defining(play.core.PlayVersion.current) { version =>
@@ -18,22 +19,17 @@

Download and review metadata

You can review the metadata added to your records by downloading the CSV file. If you would like to add or amend the metadata, return to the previous step.

- - -
@if(blockMetadataReview) { - - Back - Next From bdc94e35a6c13d204a8f5ceb950d2a1dc4747f50 Mon Sep 17 00:00:00 2001 From: Mark Kingsbury Date: Wed, 17 Jul 2024 13:18:22 +0100 Subject: [PATCH 2/7] TDRD-352-356:changes to html for standard - update tests --- test/controllers/DownloadMetadataControllerSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/DownloadMetadataControllerSpec.scala b/test/controllers/DownloadMetadataControllerSpec.scala index 6f191745e..0abf601c8 100644 --- a/test/controllers/DownloadMetadataControllerSpec.scala +++ b/test/controllers/DownloadMetadataControllerSpec.scala @@ -188,7 +188,7 @@ class DownloadMetadataControllerSpec extends FrontEndTestHelper { checkPageForStaticElements.checkContentOfPagesThatUseMainScala(responseAsString, userType = "standard") responseAsString must include("""""" + s"""""" ) responseAsString must include(s"""""" + s"""""" ) responseAsString must include(s""" Date: Wed, 31 Jul 2024 10:42:59 +0100 Subject: [PATCH 3/7] TDRD-352-356:changes to html remove steps --- README.md | 2 +- .../draftMetadataChecksResults.scala.html | 1 - ...eChecksProgressAlreadyConfirmed.scala.html | 7 +------ app/views/fileChecksResultsFailed.scala.html | 7 +------ .../judgmentBeforeUploading.scala.html | 3 +-- .../judgmentFileChecksProgress.scala.html | 4 +--- app/views/judgment/judgmentUpload.scala.html | 3 --- .../partials/progressIndicator.scala.html | 4 ---- .../transferAgreementHeader.scala.html | 2 -- ...additionalMetadataClosureStatus.scala.html | 2 +- .../additionalMetadataStart.scala.html | 3 +-- app/views/standard/confirmTransfer.scala.html | 4 +--- .../standard/downloadMetadata.scala.html | 3 +-- .../standard/fileChecksProgress.scala.html | 3 +-- .../standard/fileChecksResults.scala.html | 3 +-- app/views/standard/seriesDetails.scala.html | 3 +-- .../seriesDetailsAlreadyConfirmed.scala.html | 3 +-- .../transferAgreementPart1.scala.html | 2 +- .../transferAgreementPart2.scala.html | 2 +- app/views/standard/upload.scala.html | 3 --- app/views/transferAlreadyCompleted.scala.html | 6 ------ app/views/uploadHasCompleted.scala.html | 7 +------ app/views/uploadInProgress.scala.html | 7 +------ conf/messages | 21 ------------------- .../CheckPageForStaticElements.scala | 1 - 25 files changed, 17 insertions(+), 89 deletions(-) delete mode 100644 app/views/partials/progressIndicator.scala.html diff --git a/README.md b/README.md index d3124c1a8..c4eef3891 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ development environment for the other TDR services. - Set the Tasks parameter to `run` - Configure the environment variables: - AUTH_SECRET=\ - - NOTIFICATION_SNS_TOPIC_ARN=\ + - NOTIFICATION_SNS_TOPIC_ARN=\ - Follow the Static Assets steps below to build the CSS and JS - Run the project from IntelliJ - Visit `http://localhost:9000` diff --git a/app/views/draftmetadata/draftMetadataChecksResults.scala.html b/app/views/draftmetadata/draftMetadataChecksResults.scala.html index 07a48cdfe..bea0db059 100644 --- a/app/views/draftmetadata/draftMetadataChecksResults.scala.html +++ b/app/views/draftmetadata/draftMetadataChecksResults.scala.html @@ -7,7 +7,6 @@ @main("Results of CSV Checks", name = name) {
- @progressIndicator(Messages("draftMetadataChecksResults.progress"))

Results of your metadata checks

diff --git a/app/views/fileChecksProgressAlreadyConfirmed.scala.html b/app/views/fileChecksProgressAlreadyConfirmed.scala.html index 2f42ba37f..e7865330a 100644 --- a/app/views/fileChecksProgressAlreadyConfirmed.scala.html +++ b/app/views/fileChecksProgressAlreadyConfirmed.scala.html @@ -1,6 +1,6 @@ @import java.util.UUID @import viewsapi.FrontEndInfo -@import views.html.partials.{frontEndInputs, progressIndicator, transferReference} +@import views.html.partials.{frontEndInputs, transferReference} @(consignmentId: UUID, consignmentRef: String, frontEndInfo: FrontEndInfo, name: String, isJudgmentUser: Boolean)(implicit messages: Messages, request: RequestHeader) @title = @{if(isJudgmentUser){"Checking your upload"} else {"Checking your records"}} @@ -8,11 +8,6 @@ @defining(play.core.PlayVersion.current) { version =>
- @if(isJudgmentUser) { - @progressIndicator(Messages("judgmentCheckingRecords.progress"), isJudgmentUser) - } else { - @progressIndicator(Messages("checkingRecords.progress"), isJudgmentUser) - } @frontEndInputs(frontEndInfo)

@title

diff --git a/app/views/fileChecksResultsFailed.scala.html b/app/views/fileChecksResultsFailed.scala.html index 978c26da0..fb1d87469 100644 --- a/app/views/fileChecksResultsFailed.scala.html +++ b/app/views/fileChecksResultsFailed.scala.html @@ -1,15 +1,10 @@ -@import views.html.partials.{progressIndicator, fileCheckErrorMessage, transferReference} +@import views.html.partials.{fileCheckErrorMessage, transferReference} @(name: String, title: String, consignmentRef: String, isJudgmentUser: Boolean, fileStatuses: List[String] = Nil)(implicit request: RequestHeader, messages: Messages) @main(title, name = name, isJudgmentUser = isJudgmentUser) {
- @if(isJudgmentUser) { - @progressIndicator(Messages("judgmentCheckingRecords.progress"), isJudgmentUser) - } else { - @progressIndicator(Messages("checkingRecords.progress"), isJudgmentUser) - }

@title

- @progressIndicator(Messages("beforeUploading.progress"), isJudgmentUser = true)

Check your file before uploading

Your upload must contain the following information: