From 1be58f1e339770845411de045caf11a5b37c1ae8 Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Fri, 15 Nov 2024 12:32:07 +0000 Subject: [PATCH 1/9] retries this fix on a 3rd branch --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- .../case-editor/services/page-validation.service.ts | 2 +- .../components/search-result/search-result.component.html | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8bb3eeb326..c5edc35676 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.75", + "version": "7.1.16-accesibility", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index e61648f592..f1b9c0f66a 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.75", + "version": "7.1.16-accesibility", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/services/page-validation.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/services/page-validation.service.ts index e4d13b4780..172d7443ec 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/services/page-validation.service.ts +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/services/page-validation.service.ts @@ -16,7 +16,7 @@ export class PageValidationService { page.case_fields .filter(caseField => !this.caseFieldService.isReadOnly(caseField)) .filter(caseField => !this.isHidden(caseField, editForm)) - .map(caseField => { + .forEach(caseField => { const theControl = FieldsUtils.isCaseFieldOfType(caseField, ['JudicialUser']) ? editForm.controls['data'].get(`${caseField.id}_judicialUserControl`) : editForm.controls['data'].get(caseField.id); diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html index 66f7986a48..097fbd51a6 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html @@ -29,7 +29,7 @@

{{ (caseSt
-
@@ -56,7 +56,7 @@

{{ (caseSt
-
@@ -92,7 +92,7 @@

{{ (caseSt
-
From 8284e3ae4fa1216fa1ab3915ba5a4ab5951046be Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Mon, 18 Nov 2024 11:12:32 +0000 Subject: [PATCH 2/9] adds new tag --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c5edc35676..391efc938a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.1.16-accesibility", + "version": "7.0.75-accesibility-beta", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index f1b9c0f66a..d19e20e78f 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.1.16-accesibility", + "version": "7.0.75-accesibility-beta", "engines": { "node": ">=18.19.0" }, From 473c51ac7c156ff6241f369484742c0664b31ea4 Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Mon, 18 Nov 2024 11:45:45 +0000 Subject: [PATCH 3/9] fixes yarn audit issues --- yarn-audit-known-issues | 1 + 1 file changed, 1 insertion(+) diff --git a/yarn-audit-known-issues b/yarn-audit-known-issues index f6ae578c82..c218140e2f 100644 --- a/yarn-audit-known-issues +++ b/yarn-audit-known-issues @@ -5,6 +5,7 @@ {"value":"cookie","children":{"ID":1099846,"Issue":"cookie accepts cookie name, path, and domain with out of bounds characters","URL":"https://github.com/advisories/GHSA-pxg6-pf52-xh8x","Severity":"low","Vulnerable Versions":"<0.7.0","Tree Versions":["0.6.0"],"Dependents":["express@npm:4.19.2"]}} {"value":"copy-concurrently","children":{"ID":"copy-concurrently (deprecation)","Issue":"This package is no longer supported.","Severity":"moderate","Vulnerable Versions":"1.0.5","Tree Versions":["1.0.5"],"Dependents":["move-concurrently@npm:1.0.1"]}} {"value":"core-js","children":{"ID":"core-js (deprecation)","Issue":"core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.","Severity":"moderate","Vulnerable Versions":"1.2.7","Tree Versions":["1.2.7"],"Dependents":["fbjs@npm:0.8.18"]}} +{"value":"cross-spawn","children":{"ID":1100467,"Issue":"Regular Expression Denial of Service (ReDoS) in cross-spawn","URL":"https://github.com/advisories/GHSA-3xgq-45jj-v275","Severity":"high","Vulnerable Versions":"<7.0.5","Tree Versions":["5.1.0","7.0.3"],"Dependents":["execa@npm:0.7.0","foreground-child@npm:3.2.1"]}} {"value":"domexception","children":{"ID":"domexception (deprecation)","Issue":"Use your platform's native DOMException instead","Severity":"moderate","Vulnerable Versions":"4.0.0","Tree Versions":["4.0.0"],"Dependents":["jsdom@virtual:ce56289c4b7a2e9003d709997e253c1c80dcaee4c6fbe440cbe9ba5de5db8af3a7b7ad41bbdec5a5e3d40dc9c3c54bef92dd6885ff84cd436d636d5a1b380a61#npm:20.0.3"]}} {"value":"express","children":{"ID":1099529,"Issue":"express vulnerable to XSS via response.redirect()","URL":"https://github.com/advisories/GHSA-qw6h-vgh9-j6wx","Severity":"moderate","Vulnerable Versions":"<4.20.0","Tree Versions":["4.19.2"],"Dependents":["json-server@npm:0.15.1"]}} {"value":"figgy-pudding","children":{"ID":"figgy-pudding (deprecation)","Issue":"This module is no longer supported.","Severity":"moderate","Vulnerable Versions":"3.5.2","Tree Versions":["3.5.2"],"Dependents":["npm-registry-fetch@npm:4.0.7"]}} From 92f00ebdc93800747552c47bbbcb0582326db2c2 Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Mon, 18 Nov 2024 11:48:23 +0000 Subject: [PATCH 4/9] adds another new tag --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 391efc938a..9e1b574641 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.75-accesibility-beta", + "version": "7.0.75-accesibility-beta2", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index d19e20e78f..8a8a38c78a 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.75-accesibility-beta", + "version": "7.0.75-accesibility-beta2", "engines": { "node": ">=18.19.0" }, From dee4bb72b6ed433de35ff5629fb71a918228fee4 Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Fri, 3 Jan 2025 16:10:08 +0000 Subject: [PATCH 5/9] updates audit file --- yarn-audit-known-issues | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-audit-known-issues b/yarn-audit-known-issues index 0791c5b5f0..21c8794522 100644 --- a/yarn-audit-known-issues +++ b/yarn-audit-known-issues @@ -28,7 +28,7 @@ {"value":"mermaid","children":{"ID":1100231,"Issue":"Prototype pollution vulnerability found in Mermaid's bundled version of DOMPurify","URL":"https://github.com/advisories/GHSA-m4gq-x24j-jpmf","Severity":"high","Vulnerable Versions":"<=10.9.2","Tree Versions":["10.9.1"],"Dependents":["ngx-markdown@virtual:6ff8c2a3aef81417d9f60600e3255d97c9c6c863d8733a87ed99d869392767523e0e28c07db1eb2a034bc9265813386132447698258584d621a7fd0e13d93585#npm:17.2.1"]}} {"value":"micromatch","children":{"ID":1098681,"Issue":"Regular Expression Denial of Service (ReDoS) in micromatch","URL":"https://github.com/advisories/GHSA-952p-6rrq-rcjv","Severity":"moderate","Vulnerable Versions":"<4.0.8","Tree Versions":["4.0.5"],"Dependents":["fast-glob@npm:3.3.2"]}} {"value":"move-concurrently","children":{"ID":"move-concurrently (deprecation)","Issue":"This package is no longer supported.","Severity":"moderate","Vulnerable Versions":"1.0.1","Tree Versions":["1.0.1"],"Dependents":["cacache@npm:12.0.4"]}} -{"value":"nanoid","children":{"ID":1101092,"Issue":"Infinite loop in nanoid","URL":"https://github.com/advisories/GHSA-mwcw-c2x4-8c55","Severity":"low","Vulnerable Versions":"<3.3.8","Tree Versions":["2.1.11"],"Dependents":["json-server@npm:0.15.1"]}} +{"value":"nanoid","children":{"ID":1101163,"Issue":"Predictable results in nanoid generation when given non-integer values","URL":"https://github.com/advisories/GHSA-mwcw-c2x4-8c55","Severity":"moderate","Vulnerable Versions":"<3.3.8","Tree Versions":["2.1.11"],"Dependents":["json-server@npm:0.15.1"]}} {"value":"node-fetch-npm","children":{"ID":"node-fetch-npm (deprecation)","Issue":"This module is not used anymore, npm uses minipass-fetch for its fetch implementation now","Severity":"moderate","Vulnerable Versions":"2.0.4","Tree Versions":["2.0.4"],"Dependents":["make-fetch-happen@npm:5.0.2"]}} {"value":"npmlog","children":{"ID":"npmlog (deprecation)","Issue":"This package is no longer supported.","Severity":"moderate","Vulnerable Versions":"6.0.2","Tree Versions":["6.0.2"],"Dependents":["node-gyp@npm:9.4.0"]}} {"value":"osenv","children":{"ID":"osenv (deprecation)","Issue":"This package is no longer supported.","Severity":"moderate","Vulnerable Versions":"0.1.5","Tree Versions":["0.1.5"],"Dependents":["npm-package-arg@npm:6.1.1"]}} From 1bd6c893e3ceeda664811d4c92407149b0c1910c Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Fri, 3 Jan 2025 16:44:40 +0000 Subject: [PATCH 6/9] updates version number to create new release --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1980a75d41..3e4a6a4609 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.75-accesibility-beta2", + "version": "7.1.29-accessible-checkbox-labels", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 8a8a38c78a..9b79b6cdbc 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.0.75-accesibility-beta2", + "version": "7.1.29-accessible-checkbox-labels", "engines": { "node": ">=18.19.0" }, From 192a29f3e25d66cae37935fa1634af805517c371 Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Fri, 10 Jan 2025 15:16:25 +0000 Subject: [PATCH 7/9] changes TH to TD --- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- .../components/search-result/search-result.component.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3e4a6a4609..797c913e99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.1.29-accessible-checkbox-labels", + "version": "7.1.29-accessible-checkbox-labels2", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 9b79b6cdbc..7be910c87c 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.1.29-accessible-checkbox-labels", + "version": "7.1.29-accessible-checkbox-labels2", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html index 097fbd51a6..48be5a7abc 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html @@ -26,13 +26,13 @@

{{ (caseSt - +
- +
From aad51cd3020b29b833caf7c92518970ca7b65bd3 Mon Sep 17 00:00:00 2001 From: StoeBenHMCTS Date: Fri, 10 Jan 2025 16:04:48 +0000 Subject: [PATCH 8/9] updates to fix sonar issues --- .../components/search-result/search-result.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html index 48be5a7abc..44a2bdf0a7 100644 --- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html +++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/search-result/search-result.component.html @@ -26,7 +26,7 @@

{{ (caseSt - +
+ [attr.aria-sort]="isSortAscending(col) === null ? null : (isSortAscending(col) ? 'ascending' : 'descending')" scope="col">
{{col.label | rpxTranslate}} @@ -44,7 +44,7 @@

{{ (caseSt

- ​ + ​ From 70a9cc379ea776e10bdf1e6ba725824449e37437 Mon Sep 17 00:00:00 2001 From: Ritesh Dsouza Date: Wed, 15 Jan 2025 11:57:05 +0000 Subject: [PATCH 9/9] version updated --- RELEASE-NOTES.md | 5 ++++- package.json | 2 +- projects/ccd-case-ui-toolkit/package.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 575ea953a6..91ae6ec64d 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,7 +1,10 @@ ## RELEASE NOTES +### Version 7.1.26 +**EXUI-2223** Accessibility-issue + ### Version 7.1.25 -**EXUI-1951** etrieve current user language selection +**EXUI-1951** Retrieve current user language selection ### Version 7.1.24 Taken by PR diff --git a/package.json b/package.json index 797c913e99..df35bdb57c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.1.29-accessible-checkbox-labels2", + "version": "7.1.26", "engines": { "node": ">=18.19.0" }, diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json index 7be910c87c..6932218164 100644 --- a/projects/ccd-case-ui-toolkit/package.json +++ b/projects/ccd-case-ui-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@hmcts/ccd-case-ui-toolkit", - "version": "7.1.29-accessible-checkbox-labels2", + "version": "7.1.26", "engines": { "node": ">=18.19.0" },