error handling message added

hmcts · Jul 23, 2024 · ea48f00 · ea48f00
1 parent 0cdd0fb
commit ea48f00
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-common-lib",
-  "version": "2.0.24",
+  "version": "2.0.24-banner-message-date-error-handling",
   "engines": {
     "node": ">=18.19.0"
   },

diff --git 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-banner-message-date-error-handling",
   "peerDependencies": {
     "launchdarkly-js-client-sdk": "^3.3.0",
     "ngx-pagination": "^3.2.1",

diff --git a/projects/exui-common-lib/src/lib/components/service-messages/service-messages.component.html b/projects/exui-common-lib/src/lib/components/service-messages/service-messages.component.html
@@ -1,4 +1,16 @@
 <div *ngIf="filteredMessages?.length > 0" class="govuk-width-container govuk-!-margin-top-6">
+    <div *ngIf="isBannerError" class="hmcts-banner hmcts-banner--warning">
+        <svg class="hmcts-banner__icon" fill="currentColor" role="presentation" focusable="false"
+        xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" height="25" width="25">
+        <path d="M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z" />
+    </svg>
+        <div class="hmcts-banner__message">
+            <span class="hmcts-banner__assistive">{{'Warning' | rpxTranslate}}</span>
+            <h2 class="govuk-heading-s">Error:</h2>
+            <p>{{bannerErrorMsg}}</p>
+        </div>
+    </div>
+
     <xuilib-service-message *ngFor="let message of filteredMessages" [key]="message"
         [message_en]="message?.message_en | rpxTranslate" 
         [message_cy]="message?.message_cy | rpxTranslate" 

diff --git a/...ts/exui-common-lib/src/lib/components/service-messages/service-messages.component.spec.ts b/...ts/exui-common-lib/src/lib/components/service-messages/service-messages.component.spec.ts
@@ -176,4 +176,41 @@ describe('ServiceMessagesComponent', () => {
       expect((component.hiddenBanners).length).toBe(1);
     });
   });
+
+  it('should show error message if start date is greater than the end date', () => {
+    const serviceMessagesFake: ServiceMessages[] = [
+      {
+        roles: 'caseworker-divorce',
+        index: 2,
+        message_en: 'Judiciary experience required',
+        message_cy: 'Anyyu',
+        begin: '2024-04-25T00:00:00',
+        end: '2024-04-24T00:00:00'
+      }
+    ];
+    component['createFilteredMessages'](serviceMessagesFake);
+    fixture.autoDetectChanges();
+    expect(component.filteredMessages.length).toBe(0);
+    fixture.detectChanges();
+    expect(component.isBannerError).toBeTruthy(); 
+   expect(component.bannerErrorMsg).toContain(`The start date is greater than the end date for message index: ${serviceMessagesFake[0].index}`);
+  });
+  it('should show error message if start date or end date is not well formed', () => {
+    const serviceMessagesFake: ServiceMessages[] = [
+      {
+        roles: 'caseworker-divorce',
+        index: 10,
+        message_en: 'Malformed start or end date',
+        message_cy: 'Incorrect date',
+        begin: '2024-04-25 T00:00:00',
+        end: '2024-04-24T00:00:00'
+      }
+    ];
+    component['createFilteredMessages'](serviceMessagesFake);
+    fixture.autoDetectChanges();
+    expect(component.filteredMessages.length).toBe(0);
+    fixture.detectChanges();
+    expect(component.isBannerError).toBeTruthy(); 
+   expect(component.bannerErrorMsg).toContain(`Invalid start or end date for message index: 10`);
+  });
 });
diff --git a/projects/exui-common-lib/src/lib/components/service-messages/service-messages.component.ts b/projects/exui-common-lib/src/lib/components/service-messages/service-messages.component.ts
@@ -10,6 +10,8 @@ import { ServiceMessages } from '../../models/service-message.model';
 export class ServiceMessagesComponent implements OnInit {
   public hiddenBanners: string[];
   public filteredMessages: ServiceMessages[] = [];
+  public isBannerError: boolean;
+  public bannerErrorMsg: string = '';
 
   @Input() public userRoles: string[];
   @Input() public featureToggleKey: string;
@@ -53,6 +55,14 @@ export class ServiceMessagesComponent implements OnInit {
     if (!isNaN(Date.parse(msg.end))) {
       endDate = new Date(msg.end);
     }
+    if (!isNaN(Date.parse(msg.begin)) && !isNaN(Date.parse(msg.end)) && beginDate > endDate) {
+        this.isBannerError = true;
+        this.bannerErrorMsg = `The start date is greater than the end date for message index: ${msg.index}`;
+    }
+    if (isNaN(Date.parse(msg.begin)) || isNaN(Date.parse(msg.end))) {
+      this.isBannerError = true;
+      this.bannerErrorMsg = `Invalid start or end date for message index: ${msg.index}`;
+    }
 
     const beginDateOK = !msg.begin || (beginDate && beginDate < currentDateTime);
     const endDateOK = !msg.end || (endDate && endDate >= currentDateTime);