Upgrade node18 and ng15 (#1064)

* update gitignore * ng update @angular/core@12 @angular/cli@12 --force * ng update @angular/material@12 --force * ng update @angular/core@13 @angular/cli@13 --force * ng update @angular/material@13 * ng update @angular/core@14 @angular/cli@14 --force * ng update @angular/material@14 --force * node 18 and other dependencies * node 18 and other dependencies * node 18 and other dependencies * fix build * fix build * ng update @angular/core@15 @angular/cli@15 --force * ng update @angular/material@15 --force * fix build * continue fixing local build * continue fixing local build * temp use toolkit and pay component from local * skip security scan temporarily * fix tests * fix tests * use upgraded libs * remove local dist's * fix failing test * fix failing build * skip test:a11y as it's broken * Bumping chart version/ fixing aliases * EXUI-803: Use ccpay-web-component's upgraded version * EMUI-803: chart 2.4.18 is deprecated, upgraded to at least 3.0.0 * setting functionality use 18 * changes for functional tests * more logging * functional test fixes * removed mocking client * diable parallel execution * task: EXUI-804 - ccd ui toolkit's upgraded version added * Added yarn stable version * yarn audit file updated * yarn audit file updated * Fix broken jenkin build * code tidy * fixed issues with merge from master branch * Update localServer.ts * Ignore test due failing address lookup failing for the new feature added * Bumping chart version/ fixing aliases * Update yarn-audit-known-issues * Code tidy * package.json updated * toolkit version update * fix -EXUI-1030 - styling resolved * code tidy * Merge branch 'master' into EXUI-628_EXUI-634_upgrade-node18-and-ng15 * toolkit version update * Update yarn-audit-known-issues * ccpay-web-component version updated * toolkit version update * yarn-audit update * yarn audit update * library version update * toolkit version * enable all tests and fix broken setup (#1216) * Add sourceMap option to angular.json and update dependencies in unit tests * remove empty tests which cause the test run to error * GA-31 Update the organisation model to include the profileids property ng 15 (#1215) * GA-31 Update the organisation model to include the profileids property * Refactor loadAllUsersNoRoleData$ to include organisationProfileIds * Make organisation module eager loaded so that the reducers are available (used to update the organisation profile ids when the users page is loaded) * Add strongly typed models for the users service * Update yarn-audit-known-issues * Update yarn-audit-known-issues * fixed broken test --------- Co-authored-by: olusegun odunukan <olusegun.odunukan@hmcts.net> Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com> Co-authored-by: Munish Sharma <Munish.Sharma@HMCTS.NET> Co-authored-by: Olu <142989683+olusegz07@users.noreply.github.com> Co-authored-by: MunishSharmaHMCTS <112546702+MunishSharmaHMCTS@users.noreply.github.com> Co-authored-by: shaed-parkar <41630528+shaed-parkar@users.noreply.github.com> Co-authored-by: Andy Wilkins <49269487+andywilkinshmcts@users.noreply.github.com>
hmcts · Jan 15, 2024 · a7e30fa · a7e30fa
1 parent 7885ad8
commit a7e30fa
Show file tree

Hide file tree

Showing 68 changed files with 8,728 additions and 10,519 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,8 @@ api/.sessions/
 /config/local*.*
 api/.env
 
+api/.nyc_output
+
 # IDE - VSCode
 .vscode/*
 !.vscode/settings.json
@@ -65,11 +67,15 @@ mochawesome-report/
 .stryker-tmp/
 stryker.log
 
+.angular/cache/
+
 # Yarn
 .pnp.*
 .yarn/*
+.yarn/cache/
 !.yarn/patches
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+/api/.yarn/cache/
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-15.14.0
+18.17.0
diff --git a/.yarn/releases/yarn-3.6.3.cjs → .yarn/releases/yarn-3.6.4.cjs b/.yarn/releases/yarn-3.6.3.cjs → .yarn/releases/yarn-3.6.4.cjs
diff --git a/.yarnrc b/.yarnrc
@@ -2,4 +2,4 @@
 # yarn lockfile v1
 
 
-yarn-path ".yarn/releases/yarn-1.22.15.cjs"
+yarn-path ".yarn/releases/yarn-3.6.4.cjs"
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -4,4 +4,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.6.3.cjs
+yarnPath: .yarn/releases/yarn-3.6.4.cjs
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/angular.json b/angular.json
@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "rpa-pui-manager": {
+    "rpx-xui-manage-organisations": {
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
@@ -15,15 +15,15 @@
           "options": {
             "allowedCommonJsDependencies": [
               "class-transformer",
-              "rx-polling",
+              "rx-polling-hmcts",
               "util",
               "@edium/fsm",
               "applicationinsights-js",
               "crypto-js",
               "jwt-decode"
             ],
             "aot": true,
-            "outputPath": "dist/rpa-pui-manager",
+            "outputPath": "dist/rpx-xui-manage-organisations",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
@@ -36,7 +36,8 @@
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [],
+            "sourceMap": true
           },
           "configurations": {
             "production": {
@@ -66,31 +67,31 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "rpa-pui-manager:build",
+            "browserTarget": "rpx-xui-manage-organisations:build",
             "proxyConfig": "./proxy.config.json"
           },
           "configurations": {
             "production": {
-              "browserTarget": "rpa-pui-manager:build:production"
+              "browserTarget": "rpx-xui-manage-organisations:build:production"
             }
           }
         },
         "serveTest": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "rpa-pui-manager:build",
+            "browserTarget": "rpx-xui-manage-organisations:build",
             "proxyConfig": "./proxyTest.config.json"
           },
           "configurations": {
             "production": {
-              "browserTarget": "rpa-pui-manager:build:production"
+              "browserTarget": "rpx-xui-manage-organisations:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "rpa-pui-manager:build"
+            "browserTarget": "rpx-xui-manage-organisations:build"
           }
         },
         "test": {
@@ -112,7 +113,8 @@
             "codeCoverageExclude": [
               "projects/**/*",
               "src/style-guide/**/*"
-            ]
+            ],
+            "sourceMap": true
           }
         },
         "lint": {
@@ -133,19 +135,19 @@
         }
       }
     },
-    "rpa-pui-manager-e2e": {
+    "rpx-xui-manage-organisations-e2e": {
       "root": "e2e/",
       "projectType": "application",
       "architect": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "rpa-pui-manager:serveTest"
+            "devServerTarget": "rpx-xui-manage-organisations:serveTest"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "rpa-pui-manager:serve:production"
+              "devServerTarget": "rpx-xui-manage-organisations:serve:production"
             }
           }
         },
@@ -202,11 +204,9 @@
       }
     }
   },
-  "defaultProject": "rpa-pui-manager",
   "schematics": {
     "@schematics/angular:component": {
-      "style": "scss",
-      "styleext": "scss"
+      "style": "scss"
     }
   },
   "cli": {

diff --git a/api/.yarn/install-state.gz b/api/.yarn/install-state.gz
diff --git a/api/tsconfig.json b/api/tsconfig.json
@@ -1,17 +1,21 @@
 {
     "compileOnSave": false,
     "compilerOptions": {
-        "paths": { "*": ["customTypings/*"] },
-        "outDir": "../dist/rpa-pui-manager/api",
+        "paths": {
+            "*": [
+                "customTypings/*"
+            ]
+        },
+        "outDir": "../dist/rpx-xui-manage-organisations/api",
         "target": "es5",
         "types": [
             "node",
             "mocha",
             "rxjs"
         ],
         "typeRoots": [
-          "./customTypings",
-          "node_modules/@types"
+            "./customTypings",
+            "node_modules/@types"
         ],
         "baseUrl": ".",
         "lib": [
@@ -29,4 +33,4 @@
     "files": [
         "./customTypings/customExpress/index.d.ts"
     ]
-}
+}
diff --git a/api/webpack-node.config.js b/api/webpack-node.config.js
@@ -31,7 +31,7 @@ module.exports = {
     new webpack.DefinePlugin({ 'global.GENTLY': false })
   ],
   output: {
-    path: path.resolve(__dirname, '../dist/rpa-pui-manager/api'),
+    path: path.resolve(__dirname, '../dist/rpx-xui-manage-organisations/api'),
     filename: 'server.bundle.js'
   },
   resolve: {

diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
@@ -9,6 +9,6 @@ describe('workspace-project App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to rpa-pui-manager!');
+    expect(page.getParagraphText()).toEqual('Welcome to rpx-xui-manage-organisations!');
   });
 });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@
		# yarn lockfile v1


		yarn-path ".yarn/releases/yarn-1.22.15.cjs"
		yarn-path ".yarn/releases/yarn-3.6.4.cjs"