Added fix and test changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.2.51",
+  "version": "7.2.51-error-trigger-nav",
   "engines": {
     "node": ">=18.19.0"
   },

projects/ccd-case-ui-toolkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.2.51",
+  "version": "7.2.51-error-trigger-nav",
   "engines": {
     "node": ">=18.19.0"
   },

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/services/event-trigger.resolver.spec.ts

@@ -237,12 +237,33 @@ describe('EventTriggerResolver', () => {
        expect(err).toBeTruthy();
        expect(alertService.setPreserveAlerts).toHaveBeenCalledWith(true);
        expect(alertService.error).toHaveBeenCalledWith(ERROR.message);
-       expect(router.navigate).toHaveBeenCalled();
+       expect(router.navigate).toHaveBeenCalledWith([`/cases/case-details/PRIVATELAW/PRLAPPS/${CASE_ID}/tasks`]);
         done();
       });
     expect(profileService.get).toHaveBeenCalledWith();
   });
 
+  it('should not navigate to tasks on error if url is present', done => {
+    casesService.getEventTrigger.and.returnValue(throwError(ERROR));
+    profileService.get.and.returnValue(PROFILE_OBS);
+    router.url = '/cases/case-details/';
+
+    eventTriggerResolver
+      .resolve(route)
+      .then(data => {
+        fail(data);
+      }, err => {
+      err.details = { eventId: 'createBundle', ...err.details };
+       expect(err).toBeTruthy();
+       expect(alertService.setPreserveAlerts).toHaveBeenCalledWith(true);
+       expect(alertService.error).toHaveBeenCalledWith(ERROR.message);
+       expect(router.navigate).not.toHaveBeenCalledWith([`/cases/case-details/${CASE_ID}/tasks`]);
+        done();
+      });
+    expect(profileService.get).toHaveBeenCalledWith();
+  });
+
+
   it('should return cached profile without making API call', () => {
     casesService.getEventTrigger.and.returnValue(EVENT_TRIGGER_OBS);
     eventTriggerResolver['cachedProfile'] = PROFILE_CACHED;

projects/ccd-case-ui-toolkit/src/lib/shared/components/case-viewer/services/event-trigger.resolver.ts

@@ -114,8 +114,10 @@ export class EventTriggerResolver implements Resolve<CaseEventTrigger> {
           this.alertService.setPreserveAlerts(true);
           this.alertService.error(error.message);
           this.errorNotifier.announceError(error);
-          caseTypeId = route.parent.paramMap.get('caseType');
-          this.router.navigate([`/cases/case-details/${jurisdiction}/${caseType}/${cid}/tasks`]);
+          if (!this.router.url?.includes('/cases/case-details/')) {
+            caseTypeId = route.parent.paramMap.get('caseType');
+            this.router.navigate([`/cases/case-details/${jurisdiction}/${caseType}/${cid}/tasks`]);
+          }
           return throwError(error);
         })
       ).toPromise();