Cookie banner changes for ISDB-596

Jenkinsfile_CNP

@@ -1,4 +1,5 @@
 #!groovy
+import uk.gov.hmcts.contino.GithubAPI
 
 @Library("Infrastructure")
 
@@ -14,5 +15,14 @@ withPipeline(type, product, component) {
   afterAlways('build') {
     yarnBuilder.yarn('build')
   }
+
+   onPR() {
+    env.ENV = 'preview'
+    // enableCleanupOfHelmReleaseOnSuccess()
+    def githubApi = new GithubAPI(this)
+    if (!githubApi.getLabelsbyPattern(env.BRANCH_NAME, "keep-helm")) {
+      enableCleanupOfHelmReleaseOnSuccess()
+    }
+  }
 
 }

config/default.yaml

@@ -16,7 +16,7 @@ session:
     host:
     key:
 api:
-  cos: 'https://fis-cos-api-pr-161.service.core-compute-preview.internal'    
+  cos: 'https://fis-cos-api-pr-165.service.core-compute-preview.internal'    
   serviceAuth: 'http://rpe-service-auth-provider-aat.service.core-compute-aat.internal' 
 uploadPolicy:
   documentSize: 20 

config/development.yaml

@@ -16,7 +16,7 @@ session:
     host:
     key:
 api:
-  cos: 'https://fis-cos-api-pr-161.service.core-compute-preview.internal'   
+  cos: 'https://fis-cos-api-pr-165.service.core-compute-preview.internal'   
   serviceAuth: 'http://rpe-service-auth-provider-aat.service.core-compute-aat.internal'
 uploadPolicy:
   documentSize: 20    

src/main/server.ts

@@ -16,6 +16,7 @@ import { Helmet } from './modules/helmet';
 import { LanguageToggle } from './modules/i18n';
 import { Nunjucks } from './modules/nunjucks';
 import { PropertiesVolume } from './modules/properties-volume';
+import { Webpack } from './modules/webpack';
 import { Routes } from './routes';
 import { SessionStorage } from './settings/redis/redis';
 
@@ -39,6 +40,7 @@ new HealthCheck().enableFor(app);
 new ErrorHandler().enableFor(app, logger);
 new ErrorHandler().handleNextErrorsFor(app);
 new Nunjucks().enableFor(app);
+new Webpack().enableFor(app);
 app.locals.developmentMode = process.env.NODE_ENV !== 'production';
 app.use(favicon(path.join(__dirname, '/public/assets/images/favicon.ico')));
 app.use(bodyParser.json() as RequestHandler);

src/main/steps/common/webpack/js-template.njk

@@ -1,2 +1,2 @@
  <script src="/<%= htmlWebpackPlugin.files.js[0].substr(htmlWebpackPlugin.files.publicPath.length) %>"></script>
-  <script src="/test.js"></script>
+  <script src="/cookie.js"></script>

src/main/steps/common/webpack/js.njk

@@ -1,2 +1,2 @@
  <script src="/main-dev.js"></script>
-  <script src="/test.js"></script>
+  <script src="/cookie.js"></script>

src/main/steps/cookie-banner/template.njk

@@ -5,7 +5,7 @@
   <p>{{ cookiesLine2 }}</p>
 {% endset %}
 
-<div class="global-cookie-message" id="cm-cookie-banner" >
+<div class="global-cookie-message" id="cm-cookie-banner" hidden >
   {{ govukCookieBanner({
     ariaLabel: cookiesHeading + " " + serviceName,
     messages: [

src/main/steps/urls.ts

@@ -8,7 +8,7 @@ export const SAVE_AND_SIGN_OUT: PageLink = '/save-and-sign-out';
 export const TIMED_OUT_URL: PageLink = '/timed-out';
 export const KEEP_ALIVE_URL: PageLink = '/keep-alive';
 export const CSRF_TOKEN_ERROR_URL: PageLink = '/csrf-token-error';
-export const CASE_SEARCH_URL: PageLink = '/edgecase/casefinder';
+export const CASE_SEARCH_URL: PageLink = '/edgeCase/casefinder';
 export const SERVICE_TYPE: PageLink = '/service-type';
 export const DASHBOARD_URL: PageLink = '/dashboard';
 export const ELIGIBILITY_URL: PageLink = '/eligibility';

src/main/steps/webpack/js-template.njk

@@ -1,2 +1,2 @@
  <script src="/<%= htmlWebpackPlugin.files.js[0].substr(htmlWebpackPlugin.files.publicPath.length) %>"></script>
-  <script src="/test.js"></script>
+  <script src="/cookie.js"></script>

src/main/steps/webpack/js.njk

@@ -1,2 +1,2 @@
  <script src="main-dev.js"></script>
-  <script src="test.js"></script>
+  <script src="cookie.js"></script>

src/main/views/webpack/js-template.njk

@@ -1,2 +1,2 @@
  <script src="/<%= htmlWebpackPlugin.files.js[0].substr(htmlWebpackPlugin.files.publicPath.length) %>"></script>
-  <script src="/test.js"></script>
+  <script src="/cookie.js"></script>

src/main/views/webpack/js.njk

@@ -1,3 +1,3 @@
  <script src="main-dev.js"></script>
-  <script src="test.js"></script>
+  <script src="cookie.js"></script>