Merge branch 'release/6.5.0'

Jenkinsfile

@@ -55,7 +55,8 @@ pipeline {
         nvm('') {
           catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') {
             sh 'npm run test-with-coverage'
-            sh 'npm run test-clean'
+            sh 'npm run test-clearCache'
+            sh "rm -rf /tmp/jest_${JOB_BASE_NAME}"
           }
         }
       }

angular.json

@@ -28,7 +28,12 @@
             "aot": true,
             "assets": [
               "src/assets/favicon.ico",
-              "src/assets"
+              "src/assets",
+              {
+                "glob": "open-id-connect-redirect.html",
+                "input": "src/static-pages",
+                "output": "/redirects"
+              }
             ],
             "styles": [
               "src/styles.scss",

jest.config.js

@@ -33,7 +33,7 @@ module.exports = {
   },
   globals: {
     'ts - jest': {
-      tsConfig: 'tsconfig.spec.json',
+      tsconfig: 'tsconfig.spec.json',
       stringifyContentPathRegex: '\\.html'
     }
   },
@@ -53,5 +53,6 @@ module.exports = {
   ],
   transformIgnorePatterns: [
     'node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)' // Ignore files inside node_modules folder
-  ]
+  ],
+  cacheDirectory: '/tmp/jest_'+ (process.env.JOB_BASE_NAME || 'cache')
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdm-ui",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -10,7 +10,7 @@
     "test": "jest",
     "test-with-coverage": "jest --coverage",
     "test-watch": "jest --watch",
-    "test-clean": "jest --clearCache",
+    "test-clearCache": "jest --clearCache",
     "lint": "ng lint",
     "eslint": "tsc --noEmit && eslint . --ext ts --quiet --fix",
     "eslint-nofix": "tsc --noEmit && eslint . --ext ts --quiet",
@@ -38,7 +38,7 @@
     "@bpmn-io/dmn-migrate": "^0.4.3",
     "@ctrl/ngx-codemirror": "4.0.1",
     "@fortawesome/fontawesome-free": "5.15.1",
-    "@maurodatamapper/mdm-resources": "git+https://github.com/MauroDataMapper/mdm-resources.git#4.8.0",
+    "@maurodatamapper/mdm-resources": "git+https://github.com/MauroDataMapper/mdm-resources.git#4.9.0",
     "@uirouter/angular": "7.0.0",
     "@uirouter/core": "6.0.6",
     "@uirouter/rx": "0.6.5",