Merge branch 'release/7.0.0' into main

.eslintrc.json

@@ -23,8 +23,7 @@
         "eslint-plugin-jsdoc",
         "@angular-eslint/eslint-plugin-template",
         "eslint-plugin-prefer-arrow",
-        "@typescript-eslint",
-        "@typescript-eslint/tslint"
+        "@typescript-eslint"
     ],
     "rules": {
         "@angular-eslint/component-class-suffix": "error",
@@ -140,6 +139,7 @@
         "@typescript-eslint/no-unsafe-member-access": "off",
         "@typescript-eslint/no-unsafe-call": "off",
         "@typescript-eslint/no-unsafe-return": "off",
+        "@typescript-eslint/no-unsafe-argument" : "warn",
         "@typescript-eslint/no-unnecessary-type-assertion": "off",
         "@typescript-eslint/no-shadow": [
             "error",

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +1,50 @@
 ---
-name: Bug report
-about: Create a report to help us improve
+name: Report a bug
+about: Create a bug report to help us improve an area that needs fixing
 title: ''
 labels: bug
 assignees: ''
 
 ---
 
-**Describe the bug**
+Please fill in the sections below, adding/removing information where applicable:
+
+# Description
+
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+# Steps to reproduce
+
+e.g.
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+# Expected behavior
+
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+# Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+# Environment
+
+## Desktop 
+
+Please complete the following information:
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
+
+## Smartphone
+Please complete the following information:
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+# Additional context
 
-**Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Request a feature
+about: Provide a request to a new feature or enhancement you would like to see included in Mauro
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+Please fill in the sections below, adding/removing information where applicable:
+
+# Description
+
+A clear and concise description of what your feature suggestion is.
+
+# Additional context
+
+Add any other context about the request here, such as:
+
+- Screenshots, diagrams or mockups of your intentions
+- In-depth details of how you imagine the feature would function
+- Raise issues that would need to be clarified
+- Etc...

.github/ISSUE_TEMPLATE/system_error_report.md

@@ -0,0 +1,50 @@
+---
+name: Report a system error
+about: Provide details on a system error that prevented you from carrying out something
+title: ''
+labels: system error
+assignees: ''
+
+---
+
+Please fill in the sections below, adding/removing information where applicable:
+
+# Description
+
+A clear and concise description of what happened and what you were trying to do.
+
+# Steps to reproduce
+
+e.g.
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+# Expected behavior
+
+A clear and concise description of what you expected to happen.
+
+# Error details
+
+If available, include any error details automatically provided by Mauro. If using the Mauro Data Mapper UI, this is available via the "Copy details" button on an error page, then paste the details here.
+
+# Environment
+
+## Desktop 
+
+Please complete the following information:
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
+
+## Smartphone
+Please complete the following information:
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
+
+# Additional context
+
+Add any other context about the problem here.

Jenkinsfile

@@ -14,7 +14,7 @@ pipeline {
     stage('Tool Versions') {
       steps {
         nvm('') {
-          sh 'npm i -g npm@7.24.1'
+          sh 'npm i -g npm@8.3.0'
           sh 'node --version'
           sh 'npm --version'
         }
@@ -47,7 +47,7 @@ pipeline {
       }
       steps {
         nvm('') {
-          sh 'npm install'
+          sh 'npm ci'
           sh 'npm link @maurodatamapper/mdm-resources'
           sh 'symlinked names'
         }
@@ -102,7 +102,7 @@ pipeline {
       }
       post {
         always {
-          recordIssues qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]], tools: [esLint(pattern: '**/eslint_report.xml')]
+         recordIssues qualityGates: [[threshold: 1, type: 'TOTAL_ERROR', unstable: true], [threshold: 1, type: 'TOTAL_HIGH', unstable: true]], tools: [esLint(pattern: '**/eslint_report.xml')]
         }
       }
     }

NOTICE

@@ -1,4 +1,4 @@
-Copyright 2020-2021 University of Oxford
+Copyright 2020-2022 University of Oxford
 and Health and Social Care Information Centre, also known as NHS Digital
 
 Licensed under the Apache License, Version 2.0 (the "License");

angular.json

@@ -17,6 +17,11 @@
         "build": {
           "builder": "@angular-builders/custom-webpack:browser",
           "options": {
+            "allowedCommonJsDependencies": ["lodash"],
+            "sourceMap": {
+              "vendor": true
+            },
+            "preserveSymlinks": true,
             "customWebpackConfig": {
               "path": "webpack.config.js"
             },
@@ -60,7 +65,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -76,6 +80,14 @@
                   "maximumWarning": "6kb"
                 }
               ]
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
           }
         },
@@ -87,8 +99,13 @@
           "configurations": {
             "production": {
               "browserTarget": "mdm-ui:build:production"
+            },
+            "development": {
+              "browserTarget": "mdm-ui:build:development"
             }
-          }
+          },
+          "defaultConfiguration": "development"
+
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",

browserslist

@@ -5,8 +5,9 @@
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
-IE 9-11
+defaults
+##> 0.5%
+##last 2 versions
+##Firefox ESR
+##not dead
+not ie <= 11

jest.config.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2020-2021 University of Oxford
+Copyright 2020-2022 University of Oxford
 and Health and Social Care Information Centre, also known as NHS Digital
 
 Licensed under the Apache License, Version 2.0 (the "License");

license-check-and-add-config.json

@@ -32,7 +32,7 @@
 
   "licenseFormats": {
     "sass": {
-      "prepend": "// ",
+      "prepend": "//",
       "eachLine": {
         "prepend": "  "
       }