From 819780a5e2aab53a00f4f9cb0dcf8dfefc1f9896 Mon Sep 17 00:00:00 2001
From: pbardy2000 <146740183+pbardy2000@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:17:09 +0100
Subject: [PATCH 1/5] fix(cb2-12599): ensure additional examiner notes appear
 in the correct order

---
 ...adr-examiner-notes-history.component-edit.ts | 17 +++++++++--------
 ...r-examiner-notes-history-view.component.html |  2 +-
 ...xaminer-notes-history-view.component.spec.ts |  4 ++--
 ...adr-examiner-notes-history-view.component.ts | 10 ++++++----
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts b/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts
index 08e212cf4e..088856dbfb 100644
--- a/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts
+++ b/src/app/forms/custom-sections/adr-examiner-notes-history-edit/adr-examiner-notes-history.component-edit.ts
@@ -1,20 +1,19 @@
 import { KeyValue, ViewportScroller } from '@angular/common';
 import {
-  AfterContentInit,
-  Component, inject, OnDestroy, OnInit,
+  AfterContentInit, Component, OnDestroy, OnInit, inject,
 } from '@angular/core';
 import { FormArray, NgControl } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AdditionalExaminerNotes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete';
 import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type';
 import { BaseControlComponent } from '@forms/components/base-control/base-control.component';
 import { CustomControl, CustomFormControl } from '@forms/services/dynamic-form.types';
+import { ReasonForEditing } from '@models/vehicle-tech-record.model';
+import { Store } from '@ngrx/store';
 import { TechnicalRecordService } from '@services/technical-record/technical-record.service';
-import { ReplaySubject, takeUntil } from 'rxjs';
 import { updateScrollPosition } from '@store/technical-records';
 import { TechnicalRecordServiceState } from '@store/technical-records/reducers/technical-record-service.reducer';
-import { Store } from '@ngrx/store';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ReasonForEditing } from '@models/vehicle-tech-record.model';
-import { AdditionalExaminerNotes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete';
+import { ReplaySubject, takeUntil } from 'rxjs';
 
 @Component({
   selector: 'app-adr-examiner-notes-history',
@@ -62,7 +61,9 @@ export class AdrExaminerNotesHistoryEditComponent extends BaseControlComponent i
   }
 
   getAdditionalExaminerNotes(): AdditionalExaminerNotes[] {
-    return this.currentTechRecord?.techRecord_adrDetails_additionalExaminerNotes ?? [];
+    return (this.currentTechRecord?.techRecord_adrDetails_additionalExaminerNotes ?? []).sort(
+      (a, b) => +new Date(b.createdAtDate ?? '') - +new Date(a.createdAtDate ?? ''),
+    );
   }
 
   get currentAdrNotesPage(): AdditionalExaminerNotes[] {
diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.html b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.html
index 3b4d2d078f..640de5f158 100644
--- a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.html
+++ b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="control">
-  <ng-container *ngIf="adrNotes">
+  <ng-container *ngIf="getAdditionalExaminerNotes() as adrNotes">
     <section class="govuk-!-margin-top-4">
       <label *ngIf="control.meta?.label" class="govuk-label govuk-label--m">
         {{ control.meta.label }}
diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts
index 49990b478e..d613b53cfa 100644
--- a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts
+++ b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.spec.ts
@@ -69,13 +69,13 @@ describe('AdrExaminerNotesHistoryViewComponent', () => {
       component.currentTechRecord.techRecord_adrDetails_additionalExaminerNotes = [
         { createdAtDate: 'test', lastUpdatedBy: 'test', note: 'test note' },
       ];
-      expect(component.adrNotes).toEqual([{ createdAtDate: 'test', lastUpdatedBy: 'test', note: 'test note' }]);
+      expect(component.getAdditionalExaminerNotes()).toEqual([{ createdAtDate: 'test', lastUpdatedBy: 'test', note: 'test note' }]);
     });
 
     it('should return an empty array if the adr examiner notes is undefined', () => {
       component.currentTechRecord = { ...MOCK_HGV };
       component.currentTechRecord.techRecord_adrDetails_additionalExaminerNotes = undefined;
-      expect(component.adrNotes).toEqual([]);
+      expect(component.getAdditionalExaminerNotes()).toEqual([]);
     });
   });
 
diff --git a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.ts b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.ts
index 4e12d6f635..8e0b8244a7 100644
--- a/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.ts
+++ b/src/app/forms/custom-sections/adr-examiner-notes-history-view/adr-examiner-notes-history-view.component.ts
@@ -2,14 +2,14 @@ import {
   Component, inject, OnDestroy, OnInit,
 } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { BaseControlComponent } from '@forms/components/base-control/base-control.component';
 import { AdditionalExaminerNotes } from '@dvsa/cvs-type-definitions/types/v3/tech-record/get/hgv/complete';
 import { TechRecordType } from '@dvsa/cvs-type-definitions/types/v3/tech-record/tech-record-vehicle-type';
+import { BaseControlComponent } from '@forms/components/base-control/base-control.component';
+import { RouterService } from '@services/router/router.service';
 import { TechnicalRecordService } from '@services/technical-record/technical-record.service';
 import {
   map, Observable, Subject, takeUntil,
 } from 'rxjs';
-import { RouterService } from '@services/router/router.service';
 
 @Component({
   selector: 'app-adr-examiner-notes-history-view',
@@ -47,8 +47,10 @@ export class AdrExaminerNotesHistoryViewComponent extends BaseControlComponent i
     this.cdr.detectChanges();
   }
 
-  get adrNotes(): AdditionalExaminerNotes[] {
-    return this.currentTechRecord?.techRecord_adrDetails_additionalExaminerNotes ?? [];
+  getAdditionalExaminerNotes(): AdditionalExaminerNotes[] {
+    return (this.currentTechRecord?.techRecord_adrDetails_additionalExaminerNotes ?? []).sort(
+      (a, b) => +new Date(b.createdAtDate ?? '') - +new Date(a.createdAtDate ?? ''),
+    );
   }
 
   get currentAdrNotesPage(): AdditionalExaminerNotes[] {

From 7c37730048b4e14592344b7c15df4ccda9e6914e Mon Sep 17 00:00:00 2001
From: Josh Carter <35105612+JoshCarter-ops@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:44:12 +0100
Subject: [PATCH 2/5] feat(cb2-12599) adding temp fixup for the gha action

---
 .github/workflows/pr-checks.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 41c88c0670..4f72bf350b 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -95,6 +95,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
+      - uses: actions/setup-node@v4
+        with:
+          version: '16'
+          
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_MGMT_ROLE }}
@@ -113,4 +117,4 @@ jobs:
           -Dsonar.token=${{ env.SONARQUBE_GHA_TOKEN }} \
           -Dsonar.login=${{ env.SONARQUBE_GHA_TOKEN }} \
           -Dsonar.projectName=${{ github.repository }} \
-          -Dsonar.projectVersion=1.0.${{ github.run_id }}
\ No newline at end of file
+          -Dsonar.projectVersion=1.0.${{ github.run_id }}

From c15fa18f947b99e96614e1623967ca69de3d405d Mon Sep 17 00:00:00 2001
From: Josh Carter <35105612+JoshCarter-ops@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:47:53 +0100
Subject: [PATCH 3/5] Update pr-checks.yml

---
 .github/workflows/pr-checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 4f72bf350b..5ea41a256f 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -97,7 +97,7 @@ jobs:
           node-version-file: '.nvmrc'
       - uses: actions/setup-node@v4
         with:
-          version: '16'
+          node-version: '16'
           
       - uses: aws-actions/configure-aws-credentials@v4
         with:

From a8288f159fd7f6c78dee0cf53e04955d85b44823 Mon Sep 17 00:00:00 2001
From: Josh Carter <35105612+JoshCarter-ops@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:20:51 +0100
Subject: [PATCH 4/5] fix(cb2-12599): updated references in pr checks gha job

---
 .github/workflows/pr-checks.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 5ea41a256f..dc3f13a587 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -19,9 +19,9 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -39,9 +39,9 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -59,9 +59,9 @@ jobs:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -77,9 +77,9 @@ jobs:
       matrix:
         node-version: [18.18.0]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
@@ -92,9 +92,11 @@ jobs:
     runs-on: X64
     steps:
       - uses: actions/checkout@v4
+      
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
+
       - uses: actions/setup-node@v4
         with:
           node-version: '16'
@@ -104,12 +106,15 @@ jobs:
           role-to-assume: ${{ secrets.AWS_MGMT_ROLE }}
           aws-region: ${{ secrets.DVSA_AWS_REGION }}
           role-session-name: 'cvs-app-vtm'
-      - uses: aws-actions/aws-secretsmanager-get-secrets@v1
+
+      - uses: aws-actions/aws-secretsmanager-get-secrets@v2
         with: 
           secret-ids: sonarqube-gha
           parse-json-secrets: true
+
       - name: Install dependencies
         run: npm ci --include=optional
+
       - name: Run SonarQube scanner
         run: |
           npm run sonar-scanner -- \

From a71e4dcbbc7b1cdcf67a33a3193daff9706de5a0 Mon Sep 17 00:00:00 2001
From: Josh Carter <35105612+JoshCarter-ops@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:22:08 +0100
Subject: [PATCH 5/5] fix(cb2-12599) removed node16 version from scanner

---
 .github/workflows/pr-checks.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index dc3f13a587..24bf355eca 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -92,15 +92,11 @@ jobs:
     runs-on: X64
     steps:
       - uses: actions/checkout@v4
-      
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '16'
-          
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_MGMT_ROLE }}