Merge branch 'master' into feature/exui-2496

hmcts · Feb 5, 2025 · 5788994 · 5788994
2 parents 4398e3c + 2ec4678
commit 5788994
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 14 deletions.
diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml
@@ -15,6 +15,7 @@ on:
 
 jobs:
   build:
+    if: github.event_name != 'push' || !startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -26,9 +27,8 @@ jobs:
       - run: yarn test:audit
       - run: yarn lint
       - run: yarn build
-      - run: yarn test
       - name: Create code coverage report
-        run: yarn test:coverage
+        run: yarn test
       - 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.info
       - name: Archive code coverage results
@@ -37,7 +37,20 @@ jobs:
           name: code-coverage-report
           path: coverage
 
+  release-build:
+    if: startsWith(github.ref, 'refs/tags')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - run: corepack enable && yarn --version
+      - run: yarn install
+      - run: yarn build
+
   sonarcloud:
+    if: github.event_name != 'push' || !startsWith(github.ref, 'refs/tags')
     needs: build
     name: SonarCloud Trigger
     runs-on: ubuntu-latest
@@ -68,7 +81,7 @@ jobs:
 
   publish-npm:
     if: startsWith(github.ref, 'refs/tags')
-    needs: sonarcloud
+    needs: release-build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -86,7 +99,7 @@ jobs:
 
   publish-gpr:
     if: startsWith(github.ref, 'refs/tags')
-    needs: sonarcloud
+    needs: release-build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -101,4 +114,4 @@ jobs:
       - 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/
+          NPM_PUBLISH_REGISTRY: https://npm.pkg.github.com/
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,8 @@
 ## RELEASE NOTES
 
+### Version 7.1.33
+**EXUI-2696** Improve release process
+
 ### Version 7.1.32
 **EXUI-2729** Query Management - Callback error handling.
 

diff --git a/package.json b/package.json
@@ -36,9 +36,8 @@
     "prebuild:watch": "rimraf dist tmp",
     "preversion": "npm run ci",
     "build:ng:test": "ng build",
-    "test": "ng test ccd-case-ui-toolkit-lib  --code-coverage",
+    "test": "ng test ccd-case-ui-toolkit-lib --code-coverage",
     "test:codacy-upload": "echo `cat ./coverage/ccd-case-ui-toolkit/lcov-report/lcov.info | codacy-coverage`",
-    "test:coverage": "ng test ccd-case-ui-toolkit-lib --code-coverage",
     "test:watch": "ng test ccd-case-ui-toolkit-lib --code-coverage --watch=true",
     "test:audit": "./bin/run-yarn-audit.sh -f yarn-audit-known-issues",
     "tslint": "tslint",

diff --git a/...e-ui-toolkit/src/lib/shared/components/palette/history/event-log/event-log.component.html b/...e-ui-toolkit/src/lib/shared/components/palette/history/event-log/event-log.component.html
@@ -1,13 +1,27 @@
 <div class="grid-row">
-  <div class="column-one-half">
+  <div class="column-one-half scrollbar">
     <ng-container [ngSwitch]="isPartOfCaseTimeline">
-      <ccd-event-log-table *ngSwitchCase="true" [events]="events" [selected]="selected" (onSelect)="select($event)" (onCaseHistory)="caseHistoryClicked($event)"></ccd-event-log-table>
-      <ccd-event-log-table *ngSwitchCase="false" [events]="events" [selected]="selected" (onSelect)="select($event)"></ccd-event-log-table>
+      <ccd-event-log-table
+        *ngSwitchCase="true"
+        [events]="events"
+        [selected]="selected"
+        (onSelect)="select($event)"
+        (onCaseHistory)="caseHistoryClicked($event)"
+      ></ccd-event-log-table>
+      <ccd-event-log-table
+        *ngSwitchCase="false"
+        [events]="events"
+        [selected]="selected"
+        (onSelect)="select($event)"
+      ></ccd-event-log-table>
     </ng-container>
   </div>
   <div class="column-one-half">
     <div class="EventLog-DetailsPanel">
-      <ccd-event-log-details *ngIf="selected" [event]="selected"></ccd-event-log-details>
+      <ccd-event-log-details
+        *ngIf="selected"
+        [event]="selected"
+      ></ccd-event-log-details>
     </div>
   </div>
 </div>
diff --git a/...ts/ccd-case-ui-toolkit/src/lib/shared/components/palette/history/event-log/event-log.scss b/...ts/ccd-case-ui-toolkit/src/lib/shared/components/palette/history/event-log/event-log.scss
@@ -1,11 +1,23 @@
-@import 'govuk_frontend_toolkit/stylesheets/_colours.scss';
+@import "govuk_frontend_toolkit/stylesheets/_colours.scss";
 
 @media (max-width: 991px) {
-
-  [class*="col-md"]{
+  [class*="col-md"] {
     margin-bottom: 30px;
   }
+}
 
+.column-half,
+.column-one-half {
+  float: left;
+  width: 50%;
+}
+
+// Apply vertical scrollbar to case history div
+@media (min-width: 641px) {
+  .scrollbar {
+    height: 70vh;
+    overflow-y: auto;
+  }
 }
 
 .EventLog-DetailsPanel {