hmcts · andywilkinshmcts · Jan 15, 2024 · Aug 23, 2023 · Aug 23, 2023 · Aug 23, 2023
diff --git a/.gitignore b/.gitignore
@@ -93,4 +93,5 @@ ignore/
 !.yarn/versions
 
 /infrastructure/.terraform/
+.angular/cache/*
 install-state.gz
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-15.14.0
+18.17.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hmctspublic.azurecr.io/base/node:14-alpine as base
+FROM hmctspublic.azurecr.io/base/node:18-alpine as base
 LABEL maintainer = "HMCTS Expert UI <https://github.com/hmcts>"
 
 USER root

diff --git a/README.md b/README.md
@@ -163,7 +163,7 @@ Property 'cookies' does not exist on type 'EnhancedRequest' - you will need to m
 sure @types/express-session is added ie.
 `yarn add @types/express-session`
 
-### The following is legacy readme.
+### The following is the legacy readme.
 
 ## Code scaffolding
 

diff --git a/angular.json b/angular.json
@@ -16,6 +16,7 @@
             "aot": true,
             "buildOptimizer": true,
             "outputPath": "dist/rpx-exui",
+            "sourceMap": true,
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
@@ -27,7 +28,6 @@
               "includePaths": [
                 "node_modules/govuk_frontend_toolkit/stylesheets",
                 "node_modules/govuk-elements-sass/public/sass",
-                "node_modules/govuk-frontend/govuk/all",
                 "node_modules"
               ]
             },
@@ -148,12 +148,17 @@
             "stylePreprocessorOptions": {
               "includePaths": [
                 "node_modules/govuk_frontend_toolkit/stylesheets",
-                "node_modules/govuk-elements-sass/public/sass"
+                "node_modules/govuk-elements-sass/public/sass",
+                "node_modules"
               ]
             },
             "styles": [
               "src/styles.scss"
             ],
+            "include": [
+              "src/**/*.spec.*"
+            ],
+            "exclude": [],
             "scripts": [],
             "assets": [
               "src/favicon.ico",
@@ -162,15 +167,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**",
-              "**/api/**"
+            "eslintConfig": ".eslintrc.cjs",
+            "lintFilePatterns": [
+              "src/**/*.ts"
             ]
           }
         }
@@ -194,8 +195,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
+            "eslintConfig": ".eslintrc.js",
             "tsConfig": "e2e/tsconfig.e2e.json",
             "exclude": [
               "**/node_modules/**"
@@ -205,7 +207,6 @@
       }
     }
   },
-  "defaultProject": "rpx-exui",
   "schematics": {
     "@schematics/angular:component": {
       "style": "scss"

diff --git a/api/.yarn/install-state.gz b/api/.yarn/install-state.gz
diff --git a/api/common/httpMockAdapter.ts b/api/common/httpMockAdapter.ts
@@ -1,5 +1,5 @@
 import { AxiosInstance } from 'axios';
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMock } from './httpMock';
 
 export class HttpMockAdapter {

diff --git a/api/configuration/waSupportedServicesCaseTypesHelper.spec.ts b/api/configuration/waSupportedServicesCaseTypesHelper.spec.ts
@@ -18,7 +18,7 @@ describe('getFormattedSupportedServicesCaseTypes', () => {
   });
 
   it('should return null if the config value is null', () => {
-    const formattedServiceCasetypes = service.getFormattedSupportedServicesCaseTypes(null);
+    const formattedServiceCasetypes = service.getFormattedSupportedServicesCaseTypes('');
     expect(formattedServiceCasetypes).to.equal(null);
   });
 

diff --git a/api/configuration/waSupportedServicesCaseTypesHelper.ts b/api/configuration/waSupportedServicesCaseTypesHelper.ts
@@ -15,21 +15,24 @@ export interface WAFeatureConfig {
 
 export function getFormattedSupportedServicesCaseTypes(waSupportedServices: string): WAFeatureConfig {
   try {
-    const formattedWAFeatureConfig: WAFeatureConfig = { configurations: [] };
-    waSupportedServices.split(',').forEach((service) => {
-      const caseTypes = getConfigValue(`waSupportedServiceandCaseTypes.${service}.caseTypes`);
-      const releaseVersion = getConfigValue(`waSupportedServiceandCaseTypes.${service}.releaseVersion`);
-      const serviceConfig: ServiceConfig = {
-        caseTypes: caseTypes.split(','),
-        releaseVersion,
-        serviceName: service
-      };
-      serviceConfig.caseTypes = caseTypes.split(',');
-      serviceConfig.releaseVersion = releaseVersion;
-      serviceConfig.serviceName = service;
-      formattedWAFeatureConfig.configurations.push(serviceConfig);
-    });
-    return formattedWAFeatureConfig;
+    if (waSupportedServices) {
+      const formattedWAFeatureConfig: WAFeatureConfig = { configurations: [] };
+      waSupportedServices.split(',').forEach((service) => {
+        const caseTypes = getConfigValue(`waSupportedServiceandCaseTypes.${service}.caseTypes`);
+        const releaseVersion = getConfigValue(`waSupportedServiceandCaseTypes.${service}.releaseVersion`);
+        const serviceConfig: ServiceConfig = {
+          caseTypes: caseTypes.split(','),
+          releaseVersion,
+          serviceName: service
+        };
+        serviceConfig.caseTypes = caseTypes.split(',');
+        serviceConfig.releaseVersion = releaseVersion;
+        serviceConfig.serviceName = service;
+        formattedWAFeatureConfig.configurations.push(serviceConfig);
+      });
+      return formattedWAFeatureConfig;
+    }
+    return null;
   } catch (error) {
     logger.error('Error in formatting the supported service and case types - ', error);
     return null;

diff --git a/api/hearings/hearing.mock.ts b/api/hearings/hearing.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../common/httpMockAdapter';
 import {
   HEARING_ACTUAL, HEARING_ACTUAL_ADJOURNED, HEARING_ACTUAL_AWAITING,

diff --git a/api/noc/noCService.mock.ts b/api/noc/noCService.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import * as faker from 'faker/locale/en_GB';
 import { httpMock } from './httpMock';
 import { NoCQuestion } from './models/noCQuestion.interface';

diff --git a/api/prd/caseFlag/caseFlag.mock.ts b/api/prd/caseFlag/caseFlag.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../../common/httpMockAdapter';
 import { CASE_FLAG_REFERENCE_VALUES } from './data/caseFlagReference.mock.data';
 

diff --git a/api/prd/judicial/judicial.mock.ts b/api/prd/judicial/judicial.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../../common/httpMockAdapter';
 import { ALL_JUDICIAL_USERS, RAW_JUDICIAL_USERS } from './data/judicial.mock.data';
 import { JudicialUserModel, RawJudicialUserModel } from './models/judicialUser.model';

diff --git a/api/prd/location/location.mock.ts b/api/prd/location/location.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../../common/httpMockAdapter';
 import { ALL_COURT_LOCATIONS } from './data/location.mock.data';
 import { toEpimmsLocation } from './models/location.model';

diff --git a/api/prd/lov/lov.mock.ts b/api/prd/lov/lov.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../../common/httpMockAdapter';
 import { ALL_REF_DATA } from './data/lov.mock.data';
 

diff --git a/api/roleAccess/roleAccessService.mock.ts b/api/roleAccess/roleAccessService.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../common/httpMockAdapter';
 
 export const init = () => {

diff --git a/api/staff-ref-data/staff-ref-data.mock.ts b/api/staff-ref-data/staff-ref-data.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import * as _ from 'lodash';
 import { HttpMockAdapter } from '../common/httpMockAdapter';
 

diff --git a/api/workAllocation/caseService.mock.ts b/api/workAllocation/caseService.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../common/httpMockAdapter';
 import { filterAllWorkCases } from './caseService';
 import { CASEWORKER_ALL_CASES, CASEWORKER_MY_CASES, JUDICIAL_ALL_CASES, JUDICIAL_MY_CASES } from './constants/mock.data';

diff --git a/api/workAllocation/roleService.mock.ts b/api/workAllocation/roleService.mock.ts
@@ -1,4 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
+import MockAdapter = require('axios-mock-adapter');
 import { HttpMockAdapter } from '../common/httpMockAdapter';
 import { CASEROLES } from './constants/roles.mock.data';
 

diff --git a/charts/xui-webapp/Chart.yaml b/charts/xui-webapp/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: xui-webapp
 home: https://github.com/hmcts/rpx-xui-webapp
-version: 1.0.13
+version: 1.0.14
 description: Expert UI
 maintainers:
   - name: HMCTS RPX XUI