NFDIV-4177: Update hub page, update layout of progress bar for pre re…

…quest for information (#3903) * NFDIV-4196: Update hub page, update layout of progress bar (#3850) * NFDIV-4196: Update hub page, update layout of progess bar * NFDIV-4196: Fix unit test * NFDIV-4196: Resolve PR comments * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/steps/common/hmcts-progress-bar/_progress-bar.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/steps/applicant1/hub-page/template.njk Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4196: Repalce root url with a constant * NFDIV-4196: Update text on submitted page * NFDIV-4196: Update feedback text for Welsh * NFDIV-4201: Add application saved hub page, update submitted page (#3873) * NFDIV-4201: Add application saved hub page, update submitted page * NFDIV-4201: Update Welsh text * NFDIV-4201: Fix application saved hub page * NFDIV-4201: Fix functional test * NFDIV-4201: Revert accidental change * NFDIV-4201: Fix functional tests * NFDIV-4201: Fix functional tests * NFDIV-4201: Remove duplication * NFDIV-4203: Update hub page for international address (#3878) * NFDIV-4203: Remove unused code * NFDIV-4203: Update hub page for international adress * NFDIV-4203: Refactor code * NFDIV-4203: Add Welsh translation, refactor other code * NFDIV-4203: Fix logic * NFDIV-4206: Add logic for represented respondent and HWF (#3880) * NFDIV-4206: Add logic for represented respondent and HWF * NFDIV-4207: Add state to template selector for HWF cannot upload documents * NFDIV-4210: Update hub page when respondent represented and international address (#3884) * NFDIV-4210: Update hub page when respodent represented and international address * NFDIV-4210: Fix issue with progress bar * NFDIV-4210: Use correct function * NFDIV-4198: Add help with fees ref number on hub page (#3875) * NFDIV-4198: Add help with fees ref number on hub page * NFDIV-4198: Fix typo * NFDIV-4198: Fix typo * NFDIV-4198: Fix issue with hub page for HWF * NFDIV-4198: Fix applicant 2 submitted page issue * NFDIV-4198: Fix logic about joint HWF * NFDIV-4201: Fix duplicate case label * NFDIV-4252: Update court checks progress bar (#3898) * NFDIV-4252: Update court checks progress bar * NFDIV-4252: Delete file pushed by mistake --------- Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4177: Fix sonar issue * [NFDIV-4331] Add mobile styles for hub progress bar (#3904) * NFDIV-4196: Update hub page, update layout of progess bar * NFDIV-4196: Fix unit test * NFDIV-4196: Resolve PR comments * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/steps/common/hmcts-progress-bar/_progress-bar.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/steps/applicant1/hub-page/template.njk Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * Update src/main/assets/scss/main.scss Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4196: Repalce root url with a constant * NFDIV-4196: Update text on submitted page * NFDIV-4196: Update feedback text for Welsh * NFDIV-4201: Add application saved hub page, update submitted page (#3873) * NFDIV-4201: Add application saved hub page, update submitted page * NFDIV-4201: Update Welsh text * NFDIV-4201: Fix application saved hub page * NFDIV-4201: Fix functional test * NFDIV-4201: Revert accidental change * NFDIV-4201: Fix functional tests * NFDIV-4201: Fix functional tests * NFDIV-4201: Remove duplication * NFDIV-4203: Update hub page for international address (#3878) * NFDIV-4203: Remove unused code * NFDIV-4203: Update hub page for international adress * NFDIV-4203: Refactor code * NFDIV-4203: Add Welsh translation, refactor other code * NFDIV-4203: Fix logic * NFDIV-4206: Add logic for represented respondent and HWF (#3880) * NFDIV-4206: Add logic for represented respondent and HWF * NFDIV-4207: Add state to template selector for HWF cannot upload documents * NFDIV-4210: Update hub page when respondent represented and international address (#3884) * NFDIV-4210: Update hub page when respodent represented and international address * NFDIV-4210: Fix issue with progress bar * NFDIV-4210: Use correct function * NFDIV-4198: Add help with fees ref number on hub page (#3875) * NFDIV-4198: Add help with fees ref number on hub page * NFDIV-4198: Fix typo * NFDIV-4198: Fix typo * NFDIV-4198: Fix issue with hub page for HWF * NFDIV-4198: Fix applicant 2 submitted page issue * NFDIV-4198: Fix logic about joint HWF * NFDIV-4201: Fix duplicate case label * fix(deps): update dependency @types/node to v20.16.8 (#3897) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @types/node to v20.16.9 (#3899) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency webpack to v5.95.0 (#3900) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update webdriverio monorepo to v9.1.1 (#3901) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add mobile styles for progress bar and refactor deskptop styles * Resolve missed conflict in template selector * Remove import that was added by mistake * Delete CSS that is no longer in use * fix(deps): update dependency @types/node to v20.16.10 (#3906) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update webdriverio monorepo to v9.1.2 (#3905) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency helmet to v7.2.0 (#3907) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency helmet to v8 (#3908) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency hashicorp/terraform to v1.9.7 (#3913) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency node to v20.18.0 (#3915) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @types/lodash to v4.17.10 (#3914) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [NFDIV-4314] Use payment service requests created by case-api (Part 1) (#3911) * Pass payment callback URL to backend * Remove unused import * Update tests * Formatting changes * Adjust backend PR reference * Remove references to backend PR * Update README.md (#3917) * [NFDIV-4411] Remove vulnerable version of cookie dependency (#3921) * Upgrade express-session to remove vulnerable sub-dependency * Add cookie to resolutions * chore(deps): update webdriverio monorepo to v9.1.3 (#3920) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @types/node to v20.16.11 (#3919) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency pdfjs-dist to v4.7.76 (#3918) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update webdriverio monorepo to v9.1.4 (#3923) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency cookie-parser to v1.4.7 (#3924) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency form-data to v4.0.1 (#3926) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency express to v4.21.1 (#3925) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency typescript to v5.6.3 (#3927) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency @playwright/test to v1.48.0 (#3928) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update webdriverio monorepo to v9.1.5 (#3929) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency govuk-frontend to v5.7.0 (#3930) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency cookie to v1 (#3931) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency cookie to v1.0.1 (#3933) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update webdriverio monorepo to v9.2.1 (#3936) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency govuk-frontend to v5.7.1 (#3934) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * [NFDIV-4314] Use payment service requests created by case-api (Part 2) (#3895) * Retrieve fee service request ref from case data * Linter corrections * Link backend PR * Update case type * Create service request using new event * Lint corrections * Update tests * Refactor to simplify payment code and tests * Set payment callback on application submit * Linter corrections * Pass payment callback URL to backend * Remove unused import * Update tests * Formatting changes * Adjust backend PR reference * Remove references to backend PR * Eslint correction * Remove links to backend PR * NFDIV-4299: Add fortify scans to nightly pipeline (#3935) * NFDIV-4299: Add fortify scans to nightly pipeline * Update config/fortify-client.properties Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4299: Remove redundant gitignore file * NFDIV-4299: Enable fortify in pipeline * NFDIV-4299: Revert adding code to JenkinsFile * NFDIV-4299: Fix issue with fortify path * NFDIV-4299: Fix issue with fortify scan settings * NFDIV-4299: Remove unwanted fortify properties file --------- Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4299: Temporary disable fortify scan to fix issues (#3939) * NFDIV-4299: Add fortify scans to nightly pipeline * Update config/fortify-client.properties Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4299: Remove redundant gitignore file * NFDIV-4299: Enable fortify in pipeline * NFDIV-4299: Revert adding code to JenkinsFile * NFDIV-4299: Fix issue with fortify path * NFDIV-4299: Fix issue with fortify scan settings * NFDIV-4299: Remove unwanted fortify properties file * NFDIV-4299: Temporarily disable fortify scan --------- Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> * NFDIV-4358: Update bailiff service url (#3922) * NFDIV-4358: Update bailiff service url * NFDIV-4358: Update dependency * chore(deps): update dependency @playwright/test to v1.48.1 (#3940) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency hashicorp/terraform to v1.9.8 (#3941) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @types/node to v20.16.12 (#3942) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency npm-run-all2 to v6.2.4 (#3946) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * NFDIV-4438 Update text temporarily for webchat agents busy (#3943) * NFDIV-4438 Update text temporarily for webchat agents busy * NFDIV-4438 Update text temporarily for webchat agents busy * Revert "NFDIV-4438 Update text temporarily for webchat agents busy (#3943)" (#3947) This reverts commit d4a4b92. * chore(deps): update dependency html-webpack-plugin to v5.6.2 (#3945) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @types/lodash to v4.17.12 (#3950) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update yarn to v3.8.6 (#3949) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @types/node to v20.16.13 (#3951) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency negotiator to v0.6.4 (#3952) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency negotiator to v1 (#3953) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * NFDIV-4350: Update read me file (#3948) * fix(deps): update dependency @types/node to v20.16.14 (#3955) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --------- Co-authored-by: FaisalMoJ <faisal.amin@justice.gov.uk> Co-authored-by: FaisalMoJ <100577377+FaisalMoJ@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: pallavijustice <159147694+pallavijustice@users.noreply.github.com> Co-authored-by: DelythJustice <97962563+DelythJustice@users.noreply.github.com> * Correct progress bar icon margin --------- Co-authored-by: adamg-hmcts <159780146+adamg-hmcts@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: pallavijustice <159147694+pallavijustice@users.noreply.github.com> Co-authored-by: DelythJustice <97962563+DelythJustice@users.noreply.github.com> Co-authored-by: adamg-hmcts <adam.goddard@justice.gov.uk>
hmcts · Nov 18, 2024 · 6ccc44e · 6ccc44e
1 parent 7ea9163
commit 6ccc44e
Show file tree

Hide file tree

Showing 43 changed files with 845 additions and 494 deletions.
diff --git a/src/main/assets/scss/main.scss b/src/main/assets/scss/main.scss
@@ -13,6 +13,7 @@
 @import './webchat';
 @import './review-pages';
 @import './timeout-modal';
+@import './progress-bar';
 
 .hmcts-button-link,
 .uppy-FileInput-btn {
@@ -44,3 +45,12 @@ section {
 .red-text {
   color: govuk-colour('red');
 }
+
+.govuk-panel--confirmation {
+  background-color: #00703C; }
+
+.govuk-panel--outstanding {
+  background-color: #F3F2F1;
+  text-align: left;
+  padding: 20px;
+}
diff --git a/src/main/assets/scss/progress-bar.scss b/src/main/assets/scss/progress-bar.scss
@@ -0,0 +1,150 @@
+.hmcts-progress-bar-vertical {
+  margin: 40px 0;
+}
+
+.hmcts-progress-bar__icon {
+  position: relative;
+  background-color: govuk-colour('white');
+  border: 4px solid govuk-colour('mid-grey');
+  border-radius: 50%;
+  box-sizing: border-box;
+  display: block;
+  height: 44px;
+  margin: 0 auto;
+  width: 44px;
+
+  &--complete {
+    background-color: govuk-colour('blue');
+    border: 4px solid govuk-colour('blue');
+    background-image: url('/hmcts-assets/images/icon-progress-tick.svg');
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    background-size: 23px;
+
+    @include govuk-if-ie8 {
+      background-image: url(#{$hmcts-images-path}icon-progress-tick.png);
+    }
+  }
+
+  &--active {
+    background-color: govuk-colour('blue');
+    border: 4px solid govuk-colour('blue');
+    font-weight: 700;
+  }
+}
+
+.hmcts-progress-bar__label {
+  @include govuk-font(16);
+  word-wrap: normal;
+  display: block;
+  font-weight: inherit;
+  margin-top: 10px;
+  position: relative;
+}
+
+.hmcts-progress-bar__list {
+  font-size: 0;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  position: relative;
+  text-align: justify;
+  vertical-align: top;
+
+  @include govuk-if-ie8 {
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+  }
+
+  &::after {
+    content: "";
+    display: inline-block;
+    width: 100%;
+  }
+
+  &::before {
+    border-top: 4px solid govuk-colour('mid-grey');
+    content: "";
+    left: 30px;
+    position: absolute;
+    top: 20px;
+    bottom: 0;
+    width: 90%;
+  }
+}
+
+.hmcts-progress-bar__list-item {
+  @include govuk-font(19);
+  display: inline-block;
+  max-width: 20%;
+  position: relative;
+  text-align: center;
+  vertical-align: top;
+  width:100px;
+
+  // IE8 does not support the text justify approach for spacing
+  @include govuk-if-ie8 {
+    display: table-cell;
+  }
+
+  &:first-child, &:last-child {
+    &::before {
+      border-top: 6px solid govuk-colour("white");
+      content: "";
+      position: absolute;
+      top: 13px; left: 0;
+      width: 50%;
+    }
+  }
+
+  &:first-child::before {
+    left: 0;
+  }
+
+  &:last-child::before {
+    left: auto;
+    right: 0;
+  }
+}
+
+@media screen and (max-width: map-get($govuk-breakpoints, desktop)) {
+  .hmcts-progress-bar-vertical {
+    margin: 21px 0;
+
+    .hmcts-progress-bar {
+      &__list-item {
+        max-width:45px; display:block; margin-top: 10px;
+        margin-top: 19px;
+      }
+
+      &__icon {
+        height: 37px;
+        width: 37px;
+
+        &--complete {
+          background-size: 19px;
+        }
+      }
+
+      &__list::before {
+        border-top:none;
+        position:absolute;
+        top: 0px;
+        border-left: 6px solid govuk-colour('mid-grey');
+        height: 100%;
+        position:absolute;
+        left:20px;
+        top:0;
+      }
+
+      &__label {
+        margin-top:-29px;
+        margin-left:50px;
+        width:350px;
+        text-align:left;
+        font-size: 1.1rem;
+      }
+    }
+  }
+}
diff --git a/src/main/modules/state-redirect/index.ts b/src/main/modules/state-redirect/index.ts
@@ -10,6 +10,7 @@ import {
   APPLICANT_2,
   APPLICATION_SUBMITTED,
   APP_REPRESENTED,
+  HUB_PAGE,
   JOINT_APPLICATION_SUBMITTED,
   NO_RESPONSE_YET,
   PAYMENT_CALLBACK_URL,
@@ -106,15 +107,19 @@ export class StateRedirectMiddleware {
   private getApplicationSubmittedRedirectPath(req: AppRequest): string | null {
     const userCase = req.session.userCase;
 
-    if (userCase?.applicationType === ApplicationType.SOLE_APPLICATION && req.path !== APPLICATION_SUBMITTED) {
-      return APPLICATION_SUBMITTED;
+    if (
+      userCase?.applicationType === ApplicationType.SOLE_APPLICATION &&
+      req.path !== APPLICATION_SUBMITTED &&
+      req.path !== HUB_PAGE
+    ) {
+      return HUB_PAGE;
     }
 
     if (
       userCase?.applicationType === ApplicationType.JOINT_APPLICATION &&
-      ![JOINT_APPLICATION_SUBMITTED, APPLICANT_2 + JOINT_APPLICATION_SUBMITTED].includes(req.path)
+      ![JOINT_APPLICATION_SUBMITTED, HUB_PAGE, APPLICANT_2 + HUB_PAGE].includes(req.path)
     ) {
-      return req.session.isApplicant2 ? APPLICANT_2 + JOINT_APPLICATION_SUBMITTED : JOINT_APPLICATION_SUBMITTED;
+      return req.session.isApplicant2 ? APPLICANT_2 + HUB_PAGE : HUB_PAGE;
     }
 
     return null;

diff --git a/src/main/steps/applicant1/app-represented/content.ts b/src/main/steps/applicant1/app-represented/content.ts
@@ -85,7 +85,7 @@ const cy: typeof en = (
     link: config.get('govukUrls.domesticAbuse'),
   },
   feedback: "Helpwch ni i wella'r gwasanaeth hwn",
-  feedbackLine1: 'Complete this short, 5-minute survey to help improve our services for you and others.',
+  feedbackLine1: 'Cwblhewch yr arolwg 5 munud hwn i helpu i wella ein gwasanaethau i chi ac eraill.',
   feedbackLine2: {
     part1: 'Mae hwn yn wasanaeth newydd.',
     link: feedbackLink,

diff --git a/src/main/steps/applicant1/app-represented/progress-bar.njk b/src/main/steps/applicant1/app-represented/progress-bar.njk
diff --git a/src/main/steps/applicant1/app-represented/template.njk b/src/main/steps/applicant1/app-represented/template.njk
@@ -1,5 +1,4 @@
 {% from "govuk/components/details/macro.njk" import govukDetails %}
-{% from "components/hmcts-progress-bar/macro.njk" import hmctsProgressBar %}
 {% from "common/macros/service-address.njk" import serviceAddressMacro %}
 
 {% extends "common/page.njk" %}
@@ -18,7 +17,8 @@
     <p><strong>{{ appRepresentedText }}</strong></p>
   </div>
 
-  {% include "./progress-bar.njk" %}
+  {% include "../../common/progress-bar.njk" %}
+
   <h3 class="govuk-heading-m">{{ subHeading6 }}</h3>
   <p class="govuk-body">{{ line16.part1 }}<a class="govuk-link" href={{ line16.link }}>{{ line16.linkText }}</a></p>
   <h3 class="govuk-heading-m">{{ webChat }}</h3>