From 0c34b09d2f1bf5e4a9590b499188434772784e37 Mon Sep 17 00:00:00 2001
From: John Benjamin <john.benjamin@hmcts.net>
Date: Wed, 26 Jul 2023 15:28:23 +0100
Subject: [PATCH] EUI-8693 QM navigate to query list

---
 RELEASE-NOTES.md                                              | 3 +++
 package.json                                                  | 2 +-
 projects/ccd-case-ui-toolkit/package.json                     | 2 +-
 .../components/query-details/query-details.component.html     | 3 +++
 .../components/query-details/query-details.component.spec.ts  | 2 +-
 .../components/query-details/query-details.component.ts       | 2 +-
 .../read-query-management-field.component.html                | 4 ----
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 8296259f5d..3f258d0d53 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,4 +1,7 @@
 ## RELEASE NOTES
+### Version 6.16.0-query-management-navigate-back-to-query-list
+**EUI-8693** Query management navigate back to query list from query details
+
 ### Version 6.16.0-query-management-update-mock-data
 **EUI-8636** Query management update mock data to support CCD
 
diff --git a/package.json b/package.json
index 96fa5d476b..442abf1aab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "6.16.0-query-management-update-mock-data",
+  "version": "6.16.0-query-management-navigate-back-to-query-list",
   "engines": {
     "yarn": "^3.5.0",
     "npm": "^8.10.0"
diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json
index bc4289260e..7739e92ece 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": "6.16.0-query-management-update-mock-data",
+  "version": "6.16.0-query-management-navigate-back-to-query-list",
   "engines": {
     "yarn": "^3.5.0",
     "npm": "^8.10.0"
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html
index 7e4ca55ea5..788024b2b6 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.html
@@ -1,4 +1,7 @@
 <ng-container *ngIf="query">
+  <p>
+    <a class="govuk-link" href="javascript:void(0)" (click)="onBack()">{{ 'Back to query list' | rpxTranslate }}</a>
+  </p>
   <div>
     <table class="govuk-table query-details-table" [attr.aria-describedby]="'Details of the query' | rpxTranslate">
       <caption class="govuk-table__caption govuk-table__caption--l">
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts
index 0d401936c5..41dfee288f 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.spec.ts
@@ -25,7 +25,7 @@ describe('QueryDetailsComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should emit event on clcking back to queries', () => {
+  it('should emit event on clcking back to query list', () => {
     spyOn(component.backClicked, 'emit');
     component.onBack();
     expect(component.backClicked.emit).toHaveBeenCalled();
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.ts
index ca0a73c612..ab151fb3d6 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/components/query-details/query-details.component.ts
@@ -22,6 +22,6 @@ export class QueryDetailsComponent {
     const userDetails = JSON.parse(this.sessionStorage.getItem('userDetails'));
     return userDetails && userDetails.roles
       && !(userDetails.roles.includes('pui-case-manager')
-        || userDetails.roles.some((role) => role.toLowerCase().includes('judge')))
+        || userDetails.roles.some((role) => role.toLowerCase().includes('judge')));
   }
 }
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html
index e0d800d2bb..6075eec0f5 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/palette/query-management/read-query-management-field.component.html
@@ -8,10 +8,6 @@
 
 <ng-template #singleQueryDetails>
   <br>
-  <p>
-    <a class="govuk-link" href="javascript:void(0)">{{ 'Back to queries' | rpxTranslate }}</a>
-  </p>
-
   <ccd-query-details
     [query]="query"
     (backClicked)="showQueryList = true"