From 4cee2516d62397d348d108a55c63b81d5dc561a8 Mon Sep 17 00:00:00 2001
From: OgunyemiO <ola.ogunyemi@hmcts.net>
Date: Mon, 11 Mar 2024 12:14:56 +0000
Subject: [PATCH 1/6] label and input accessibility fixes

---
 package.json                                                    | 2 +-
 projects/exui-common-lib/package.json                           | 2 +-
 .../gov-ui/components/gov-uk-date/gov-uk-date.component.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 91c63787..3bf8ffae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.16",
+  "version": "2.0.16-accessibility-bug-fix",
   "engines": {
     "node": ">=18.17.0"
   },
diff --git a/projects/exui-common-lib/package.json b/projects/exui-common-lib/package.json
index 074ff63f..7f5d8b41 100644
--- a/projects/exui-common-lib/package.json
+++ b/projects/exui-common-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.16",
+  "version": "2.0.16-accessibility-bug-fix",
   "peerDependencies": {
     "launchdarkly-js-client-sdk": "^2.15.2",
     "ngx-pagination": "^3.2.1",
diff --git a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html
index 7f6b8328..73cd864b 100644
--- a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html
+++ b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html
@@ -21,7 +21,7 @@
             </xuilib-gov-label>
             <input class="govuk-input govuk-date-input__input govuk-input--width-2"
                    [ngClass]="{'govuk-input--error': errorMessage?.isInvalid}"
-                   [id]="config.id"
+                   [id]="config.id+'-day'"
                    [name]="config.id+'-day'" type="number" value="" pattern="[0-9]*"
                    [formControlName]="config.id+'_day'">
           </div>

From a044efd240e468b1372a1b2a89c9d8fc0c5d8cc8 Mon Sep 17 00:00:00 2001
From: OgunyemiO <ola.ogunyemi@hmcts.net>
Date: Mon, 11 Mar 2024 13:45:11 +0000
Subject: [PATCH 2/6] find location aria fix

---
 .../lib/components/find-location/find-location.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html b/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html
index 090c8be2..790610f4 100644
--- a/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html
+++ b/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html
@@ -1,7 +1,7 @@
 <div class="location-picker-custom">
   <div class="search-location">
     <div>
-      <label id="input-selected-location-label" *ngIf="locationTitle">{{locationTitle}}</label>
+      <label id="input-selected-location-label" for="inputLocationSearch" *ngIf="locationTitle">{{locationTitle}}</label>
     </div>
     <exui-search-location class="search-location"
                           [form]="form"

From 026df90ec9230231d0047d524d429d1a1bc5fd0f Mon Sep 17 00:00:00 2001
From: OgunyemiO <ola.ogunyemi@hmcts.net>
Date: Tue, 12 Mar 2024 09:50:35 +0000
Subject: [PATCH 3/6] unit test failure fix

---
 .../gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts
index 962f30aa..47c8e489 100644
--- a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts
+++ b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts
@@ -42,7 +42,7 @@ describe('GovUkDateComponent', () => {
   });
 
   it('should have input for day, month and year elements', () => {
-    const day = fixture.debugElement.query(By.css('#id'));
+    const day = fixture.debugElement.query(By.css('#id-day'));
     expect(day).toBeTruthy();
     const month = fixture.debugElement.query(By.css('#id-month'));
     expect(month).toBeTruthy();

From 1edbc2a17ef2e0c731cc0fe73a08dcf7ef49a208 Mon Sep 17 00:00:00 2001
From: OgunyemiO <ola.ogunyemi@hmcts.net>
Date: Tue, 23 Jul 2024 10:43:35 +0100
Subject: [PATCH 4/6] version number change

---
 package.json                          | 2 +-
 projects/exui-common-lib/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index eacdc147..b2c7415f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.24",
+  "version": "2.0.24-accessibility-bug-fix",
   "engines": {
     "node": ">=18.19.0"
   },
diff --git a/projects/exui-common-lib/package.json b/projects/exui-common-lib/package.json
index db5f3557..71823cc4 100644
--- a/projects/exui-common-lib/package.json
+++ b/projects/exui-common-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.24",
+  "version": "2.0.24-accessibility-bug-fix",
   "peerDependencies": {
     "launchdarkly-js-client-sdk": "^3.3.0",
     "ngx-pagination": "^3.2.1",

From 43e40636b04377a15008cdde8fa5b506a77c866c Mon Sep 17 00:00:00 2001
From: OgunyemiO <ola.ogunyemi@hmcts.net>
Date: Fri, 26 Jul 2024 10:45:38 +0100
Subject: [PATCH 5/6] version number changed

---
 package.json                          | 2 +-
 projects/exui-common-lib/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fcae23de..ba01b38f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.25",
+  "version": "2.0.25-accessibility-bug-fix",
   "engines": {
     "node": ">=18.19.0"
   },
diff --git a/projects/exui-common-lib/package.json b/projects/exui-common-lib/package.json
index 7cbabe6d..28c3a28c 100644
--- a/projects/exui-common-lib/package.json
+++ b/projects/exui-common-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.25",
+  "version": "2.0.25-accessibility-bug-fix",
   "peerDependencies": {
     "launchdarkly-js-client-sdk": "^3.3.0",
     "ngx-pagination": "^3.2.1",

From 5ab822b15aa2bc06c24510997084c1d9a206b414 Mon Sep 17 00:00:00 2001
From: RiteshHMCTS <74713687+RiteshHMCTS@users.noreply.github.com>
Date: Tue, 20 Aug 2024 16:12:02 +0100
Subject: [PATCH 6/6] Revert "Ex UI 1270 accessibility bug common lib"

---
 package.json                                                    | 2 +-
 projects/exui-common-lib/package.json                           | 2 +-
 .../lib/components/find-location/find-location.component.html   | 2 +-
 .../gov-ui/components/gov-uk-date/gov-uk-date.component.html    | 2 +-
 .../gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 001789c6..d8f362b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.27",
+  "version": "2.0.26",
   "engines": {
     "node": ">=18.19.0"
   },
diff --git a/projects/exui-common-lib/package.json b/projects/exui-common-lib/package.json
index 70d88d01..1338bf59 100644
--- a/projects/exui-common-lib/package.json
+++ b/projects/exui-common-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.27",
+  "version": "2.0.26",
   "peerDependencies": {
     "launchdarkly-js-client-sdk": "^3.3.0",
     "ngx-pagination": "^3.2.1",
diff --git a/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html b/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html
index 790610f4..090c8be2 100644
--- a/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html
+++ b/projects/exui-common-lib/src/lib/components/find-location/find-location.component.html
@@ -1,7 +1,7 @@
 <div class="location-picker-custom">
   <div class="search-location">
     <div>
-      <label id="input-selected-location-label" for="inputLocationSearch" *ngIf="locationTitle">{{locationTitle}}</label>
+      <label id="input-selected-location-label" *ngIf="locationTitle">{{locationTitle}}</label>
     </div>
     <exui-search-location class="search-location"
                           [form]="form"
diff --git a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html
index 73cd864b..7f6b8328 100644
--- a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html
+++ b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.html
@@ -21,7 +21,7 @@
             </xuilib-gov-label>
             <input class="govuk-input govuk-date-input__input govuk-input--width-2"
                    [ngClass]="{'govuk-input--error': errorMessage?.isInvalid}"
-                   [id]="config.id+'-day'"
+                   [id]="config.id"
                    [name]="config.id+'-day'" type="number" value="" pattern="[0-9]*"
                    [formControlName]="config.id+'_day'">
           </div>
diff --git a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts
index 47c8e489..962f30aa 100644
--- a/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts
+++ b/projects/exui-common-lib/src/lib/gov-ui/components/gov-uk-date/gov-uk-date.component.spec.ts
@@ -42,7 +42,7 @@ describe('GovUkDateComponent', () => {
   });
 
   it('should have input for day, month and year elements', () => {
-    const day = fixture.debugElement.query(By.css('#id-day'));
+    const day = fixture.debugElement.query(By.css('#id'));
     expect(day).toBeTruthy();
     const month = fixture.debugElement.query(By.css('#id-month'));
     expect(month).toBeTruthy();