Merge pull request #362 from hmcts/EUI-1480-develop

Eui 1480 develop
hmcts · Feb 5, 2020 · 7fe5d31 · 7fe5d31
2 parents 494d833 + 57bbbfd
commit 7fe5d31
Show file tree

Hide file tree

Showing 6 changed files with 556 additions and 460 deletions.
diff --git a/angular.json b/angular.json
@@ -60,8 +60,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "6mb",
+                  "maximumError": "8mb"
                 }
               ]
             }

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "start": "node ./dist/rpx-exui/api/server.bundle.js",
     "build:node": "cd api && yarn build",
     "build:prod": "ng build --prod",
-    "start:node": "cd api && yarn start:dev",
+    "start:node": "cd api && yarn watch",
     "lint:node": "cd api && yarn lint",
     "test:node": "cd api && yarn test",
     "coverage:node": "cd api && yarn coverage",
@@ -56,8 +56,8 @@
     "@angular/platform-browser": "^7.2.13",
     "@angular/platform-browser-dynamic": "^7.2.13",
     "@angular/router": "^7.2.13",
-    "@hmcts/ccd-case-ui-toolkit": "2.62.22-RDM-4837-prerelease",
-    "@hmcts/ccpay-web-component": "^1.8.4",
+    "@hmcts/ccd-case-ui-toolkit": "2.63.3-RDM-7120-prerelease",
+    "@hmcts/ccpay-web-component": "3.0.3",
     "@hmcts/frontend": "0.0.39-alpha",
     "@hmcts/media-viewer": "^1.1.12",
     "@hmcts/nodejs-healthcheck": "^1.5.1",
@@ -82,6 +82,7 @@
     "ejs": "^2.6.1",
     "exception-formatter": "1.0.7",
     "express-session": "^1.16.1",
+    "file-saver": "^2.0.2",
     "form-data": "^2.5.1",
     "formidable": "^1.2.1",
     "global-agent": "^2.1.7",
@@ -105,6 +106,7 @@
     "striptags": "^3.1.1",
     "tslib": "^1.9.0",
     "web-animations-js": "^2.3.2",
+    "xlsx": "^0.15.4",
     "zone.js": "~0.8.26"
   },
   "devDependencies": {

diff --git a/src/app/services/ccd-config/ccd-case.config.ts b/src/app/services/ccd-config/ccd-case.config.ts
@@ -109,4 +109,9 @@ export class AppConfig extends AbstractAppConfig {
   public getAnnotationApiUrl(): string {
     return this.config.annotation_api_url;
   }
+
+  public getPayBulkScanBaseUrl(): string {
+    return this.config.pay_bulk_scan_url;
+  }
+
 }
diff --git a/src/cases/containers/case-list/case-list.component.ts b/src/cases/containers/case-list/case-list.component.ts
@@ -216,7 +216,7 @@ export class CaseListComponent implements OnInit, OnDestroy {
       caseStateGroupFromLS = { id: this.savedQueryParams['case-state'] };
     }
 
-    const metadataFieldsGroupFromLS = ['[CASE_REFERENCE]'];
+    const metadataFieldsGroupFromLS = ['[CASE_REFERENCE]', '[CREATED_DATE]'];
 
     if (formGroupFromLS && jurisdictionFromLS && caseTypeGroupFromLS && metadataFieldsGroupFromLS && caseStateGroupFromLS) {
       return this.createEvent(jurisdictionFromLS, caseTypeGroupFromLS, caseStateGroupFromLS, metadataFieldsGroupFromLS,

diff --git a/src/web.config b/src/web.config
@@ -9,7 +9,7 @@
             <add name="Surrogate-Control" value="no-store" />
             <add name="Pragma" value="no-cache" />
             <add name="Expires" value="0" />
-            <add name="Content-Security-Policy" value="default-src 'self'; font-src 'self' https://fonts.gstatic.com data:; img-src 'self' data: https://www.google-analytics.com https://raw.githubusercontent.com/hmcts; style-src https://fonts.googleapis.com https://fonts.gstatic.com 'unsafe-inline' 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' www.google-analytics.com www.googletagmanager.com az416426.vo.msecnd.net; connect-src 'self' *.gov.uk dc.services.visualstudio.com; object-src 'self'; frame-ancestors 'none'" />
+            <add name="Content-Security-Policy" value="default-src 'self'; font-src 'self' https://fonts.gstatic.com data:; img-src 'self' data: https://www.google-analytics.com https://raw.githubusercontent.com/hmcts/; style-src https://fonts.googleapis.com https://fonts.gstatic.com 'unsafe-inline' 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' www.google-analytics.com www.googletagmanager.com az416426.vo.msecnd.net; connect-src 'self' *.gov.uk dc.services.visualstudio.com; object-src 'self'; frame-ancestors 'none'" />
             <add name="X-Content-Type-Options" value="nosniff" />
             <add name="Strict-Transport-Security" value="max-age=31536000; preload" />
             <add name="X-Frame-Options" value="DENY" />