EUI-9048: Re-release of Case Flags v2.1 incorporating Angular 15 and …

…Node 18 upgrade from master branch (#1639) * EUI-6645 Restricted case acceess * EUI-6645 Restricted case acceess * EUI-6645 Restricted case access * update version * install * Add translation package * update version * Update package * yarn install * Update package * Merge from master * Merge from master * Merge from master * Merge from master * Merge from master * EUI-8816 Restricted Case Access - Feature toggle for deployment to Production * EUI-8816 Restricted Case Access - Feature toggle for deployment to Production * EUI-8816 Restricted Case Access - Feature toggle for deployment to Production * Update package version * version update after merge from base branch * EUI-8816 Restricted case access feature toggle functionality * Upgrade to Node-18 and NG-15 (#1550) * kick-off node 18 upgrade * use pay component at local * 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 --force * ng update @angular/core@14 @angular/cli@14 --force * cdk 14 * ts version * upgraes for fix * upgrade rpx-xui-translation * upgrade yargs-parser * upgrade cli to 15 * fix damn ng breakdown * ng update @angular/material@14 --force * ng update @angular/core@15 @angular/cli@15 --force * ng update @angular/material@15 --force * correct compilation errors after upgrades * ignore angular cache * set new major version * add yarn release file * comment out broken lint task * temporarily use ccpay-component from local * fix tests * fix tests * upgrade to media viewer pre-release * update version tag * delete local ccpay dist folder * use ccpay component prerelease * skip the tasks (to be fixed later on) * remove steps to unblock pre-release * use node 14 for release * Code tide * package json update * fix update package.json file and code tidy * fix update package.json file * fix update package.json file and code tidy * package.json file update * Using legacy angular material * package.json version update * fix: EXUI-787 - Fixed lint srcipt, lint issues, code issue. Code tidy * updated codebase * fix: EXUI-790 unit test now working; EXUI-996- Fixed dateTime Picker; Fix issue probate buttons - cancel and continue button * package.json updated * Update typography.scss * Version update * Update npmpublish.yml * update polling service inline with sonarcloud - Security Hotspot * code tidy * added updated fork version of rx-polling library * fix - EXUI-996 - fix issue with incorrect date formate * App version updated and code tidy * Update RELEASE-NOTES.md * version update * Update case-file-view-folder.component.ts * Vesion update * update test and karma config * Update karma.conf.js * Update case-file-view-folder-selector.component.spec.ts * ccpay-web-component version updated * version update * fix broken functional test and update toolkit version * version update * rpx-xui-translation version update - 1.0.1 * @olusegz07 rpx-xui-translation version update - 1.0.2 --------- Co-authored-by: olusegun odunukan <[email protected]> Co-authored-by: Olu <[email protected]> * fix yarn audit issue (#1634) * fix yarn audit issue * yarn audit fix yarn audit fix * Update RELEASE-NOTES.md * Fix/ex UI 1151 yarn audit version (#1637) * fix yarn audit issue * yarn audit fix yarn audit fix * Update RELEASE-NOTES.md * Version updated * EUI-9048: Re-release of Case Flags v2.1 incorporating Angular 15 and Node 18 upgrade from master branch Change to Node version 18 in GitHub npmpublish workflow, following upgrade of CCD Toolkit to Angular 15 and Node 18. * Add trailing slash to build location Workaround for an apparent bug with npm and Node version >14 (see npm/cli#3993 for full details). --------- Co-authored-by: John Benjamin <[email protected]> Co-authored-by: David Rajkumar Jayakumar <[email protected]> Co-authored-by: DavidJayakumar <[email protected]> Co-authored-by: John Benjamin <[email protected]> Co-authored-by: codaimaster <[email protected]> Co-authored-by: olusegun odunukan <[email protected]> Co-authored-by: Olu <[email protected]>
hmcts · Dec 11, 2023 · 124f1a0 · 124f1a0
1 parent 7c17bc1
commit 124f1a0
Show file tree

Hide file tree

Showing 150 changed files with 8,892 additions and 6,238 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -0,0 +1,88 @@
+module.exports = {
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended'
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: [
+      './tsconfig.json',
+      './src/tsconfig.app.json',
+      './src/tsconfig.spec.json',
+      './api/tsconfig.json'
+    ],
+    tsconfigRootDir: __dirname
+  },
+  plugins: ['@typescript-eslint'],
+  root: true,
+  rules: {
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-extra-semi': 'off',
+    '@typescript-eslint/no-inferrable-types': 'off',
+    '@typescript-eslint/no-var-requires': 'off',
+    'array-bracket-spacing': 'error',
+    'arrow-parens': ['error', 'always'],
+    'arrow-spacing': 'error',
+    'block-spacing': 'error',
+    'brace-style': ['error', '1tbs'],
+    'comma-dangle': ['error', 'never'],
+    'comma-spacing': 'error',
+    'comma-style': 'error',
+    'computed-property-spacing': 'error',
+    'curly': ['error', 'all'],
+    'dot-notation': 'error',
+    'eol-last': 'error',
+    'eqeqeq': 'error',
+    'func-call-spacing': ['error', 'never'],
+    // 'func-style': ['error', 'expression'],
+    'getter-return': 'error',
+    'grouped-accessor-pairs': ['error', 'getBeforeSet'],
+    'key-spacing': 'error',
+    'keyword-spacing': 'error',
+    'indent': ['error', 2, {
+      'SwitchCase': 1
+    }],
+    'linebreak-style': 'error',
+    'lines-between-class-members': ['error', 'always', {
+      'exceptAfterSingleLine': true
+    }],
+    'new-parens': ['error', 'always'],
+    'no-case-declarations': 'off',
+    'no-else-return': 'error',
+    'no-empty': 'error',
+    // 'no-empty-function': ['error', {
+    //   'allow': ['constructors']
+    // }],
+    'no-extra-boolean-cast': 'off',
+    'no-extra-semi': 'error',
+    'no-mixed-spaces-and-tabs': 'error',
+    'no-multi-spaces': 'error',
+    'no-multiple-empty-lines': ['error', {
+      'max': 1,
+      'maxEOF': 1
+    }],
+    'no-prototype-builtins': 'off',
+    'no-tabs': 'error',
+    'no-trailing-spaces': 'error',
+    'no-whitespace-before-property': 'error',
+    'no-unreachable': 'error',
+    'no-unused-expressions': ['error', {
+      'allowTernary': true
+    }],
+    'no-var': 'error',
+    // 'object-curly-newline': ['error', { 'multiline': true }],
+    'object-curly-spacing': ['error', 'always'],
+    // 'object-property-newline': 'error',
+    'padded-blocks': ['error', 'never'],
+    'prefer-const': 'error',
+    'quotes': ['error', 'single'],
+    'semi': ['error', 'always', {
+      'omitLastInOneLineBlock': false
+    }],
+    'semi-spacing': 'error',
+    'semi-style': ['error', 'last'],
+    'space-in-parens': ['error', 'never'],
+    'switch-colon-spacing': 'error'
+  }
+};
diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - run: corepack enable && yarn --version
       - run: yarn install
       - run: yarn lint
@@ -29,7 +29,7 @@ jobs:
       - name: Create code coverage report
         run: yarn test:coverage
       - name: Change Report Path
-        run: sed -i 's+/home/runner/work/ccd-case-ui-toolkit/ccd-case-ui-toolkit+/github/workspace+g' coverage/ccd-case-ui-toolkit/lcov-report/lcov.info
+        run: sed -i 's+/home/runner/work/ccd-case-ui-toolkit/ccd-case-ui-toolkit+/github/workspace+g' coverage/ccd-case-ui-toolkit/lcov.info
       - name: Archive code coverage results
         uses: actions/upload-artifact@v3
         with:
@@ -73,12 +73,12 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - run: corepack enable && yarn --version
       - run: yarn install
       - run: yarn build
-      - run: npm publish dist/ccd-case-ui-toolkit --ignore-scripts
+      - run: npm publish dist/ccd-case-ui-toolkit/ --ignore-scripts
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_API_TOKEN }}
           NPM_PUBLISH_REGISTRY: https://registry.npmjs.org/
@@ -91,13 +91,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://npm.pkg.github.com/
           scope: '@hmcts'
       - run: corepack enable && yarn --version
       - run: yarn install
       - run: yarn build
-      - run: npm publish dist/ccd-case-ui-toolkit --ignore-scripts
+      - run: npm publish dist/ccd-case-ui-toolkit/ --ignore-scripts
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_PUBLISH_REGISTRY: https://npm.pkg.github.com/
diff --git a/.gitignore b/.gitignore
@@ -77,3 +77,6 @@ projects/ccd-case-ui-toolkit/.yarn/*
 !projects/ccd-case-ui-toolkit/.yarn/sdks
 !projects/ccd-case-ui-toolkit/.yarn/versions
 cptk.sh
+
+
+.angular/cache
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.17.0
+18.17.0
diff --git a/.storybook/tsconfig.json b/.storybook/tsconfig.json
@@ -16,4 +16,4 @@
   "files": [
     "./typings.d.ts"
   ]
-}
+}
diff --git a/.yarn/releases/yarn-3.5.0.cjs → .yarn/releases/yarn-3.6.4.cjs b/.yarn/releases/yarn-3.5.0.cjs → .yarn/releases/yarn-3.6.4.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,7 +1,7 @@
-nodeLinker: node-modules
+compressionLevel: mixed
 
-npmAuthToken: "${NODE_AUTH_TOKEN:-}"
+enableGlobalCache: false
 
-npmPublishRegistry: "${NPM_PUBLISH_REGISTRY:-}"
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
+yarnPath: .yarn/releases/yarn-3.6.4.cjs
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,4 +1,16 @@
 ## RELEASE NOTES
+### Version 7.0.2-case-flags-v2-1-release
+**EUI-9048** Re-tag for re-release of Case Flags v2.1, following sync of `Release` branch with latest from `master` to incorporate Angular 15 and Node 18 upgrade
+
+### Version 7.0.2
+**EXUI-1151** Angular 15 and Node 18 update
+
+### Version 7.0.1
+**EXUI-1151** Angular 15 and Node 18 update
+
+### Version 7.0.0
+**EXUI-763** Angular 15 and Node 18 update
+
 ### Version 6.19.15-welsh-translation-FirstErrorPipe-fix
 **EUI-8737** Re-tag for re-release following deployment of Restricted Case Access feature to live
 
@@ -106,7 +118,10 @@
 ### Version 6.19.6-case-file-view-document-upload-date-v2
 **EUI-7807** Case file view v1.1
 
-### Version 6.19.11-rc1
+### Version 7.0.0-rc3
+**EXUI-763** Upgrade ccd-ui-toolkit to Node 18.17.0 and Angular 15.2.9
+
+### Version 6.19.11-rc3
 **EXUI-1000** Complex type not showing data
 **EXUI-1006** Case Flags stopped working
 

diff --git a/angular.json b/angular.json
@@ -65,29 +65,12 @@
             "browserTarget": "ccd-case-ui-toolkit:build"
           }
         },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "styles": [],
-            "scripts": [],
-            "assets": [
-              "src/favicon.ico"
-            ]
-          }
-        },
         "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/**"
+            "eslintConfig": ".eslintrc.cjs",
+            "lintFilePatterns": [
+              "src/**/*.ts"
             ]
           }
         }
@@ -109,12 +92,12 @@
             }
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+        "lint":  {
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
+            "eslintConfig": ".eslintrc.cjs",
+            "lintFilePatterns": [
+              "src/**/*.ts"
             ]
           }
         }
@@ -143,7 +126,6 @@
             }
           }
         },
-
         "storybook": {
           "builder": "@storybook/angular:start-storybook",
           "options": {

diff --git a/documentation.json b/documentation.json
@@ -85641,4 +85641,4 @@
             }
         ]
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ @@
       "files": [
         "./typings.d.ts"
       ]
-    }
+    }