@hmcts/ccd-case-ui-toolkit 7.3.54-body-parser-update → 7.3.54-exui-4309

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -8918,10 +8918,10 @@ class CaseworkerService {
         this.appConfig = appConfig;
         this.errorService = errorService;
     }
-    getUserByIdamId(idamId) {
-        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUserByIdamId`;
+    getCaseworkers(serviceId) {
+        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUsersByServiceName`;
         return this.http
-            .post(url, idamId)
+            .post(url, { services: [serviceId] })
             .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
@@ -11398,6 +11398,7 @@ class CaseEditPageComponent {
     }
     ngOnInit() {
         initDialog();
+        this.clearValidationErrors();
         this.eventTrigger = this.caseEdit.eventTrigger;
         this.editForm = this.caseEdit.form;
         this.wizard = this.caseEdit.wizard;
@@ -11453,6 +11454,7 @@ class CaseEditPageComponent {
         this.dialogRefAfterClosedSub?.unsubscribe();
         this.saveDraftSub?.unsubscribe();
         this.caseFormValidationErrorsSub?.unsubscribe();
+        this.clearValidationErrors();
         this.multipageComponentStateService.reset();
     }
     applyValuesChanged(valuesChanged) {
@@ -11476,7 +11478,7 @@ class CaseEditPageComponent {
      * EUI-3732 - Breathing space data not persisted on Previous button click with ExpUI Demo
      */
     toPreviousPage() {
-        this.caseEditDataService.clearFormValidationErrors();
+        this.clearValidationErrors();
         const caseEventData = this.buildCaseEventData(true);
         caseEventData.data = caseEventData.event_data;
         this.updateFormData(caseEventData);
@@ -11649,7 +11651,7 @@ class CaseEditPageComponent {
                 this.editForm.controls['data'].removeControl('caseLinksFlag');
             }
         }
-        this.caseEditDataService.clearFormValidationErrors();
+        this.clearValidationErrors();
         this.checkForStagesCompleted();
         if (this.currentPageIsNotValid()) {
             // The generateErrorMessage method filters out the hidden fields.
@@ -11813,7 +11815,7 @@ class CaseEditPageComponent {
         else {
             this.caseEdit.cancelled.emit();
         }
-        this.caseEditDataService.clearFormValidationErrors();
+        this.clearValidationErrors();
         this.multipageComponentStateService.reset();
     }
     resetLinkedCaseJourney() {
@@ -11881,6 +11883,7 @@ class CaseEditPageComponent {
         console.log('handleError ', error);
     }
     resetErrors() {
+        this.clearValidationErrors();
         this.caseEdit.error = null;
         this.caseEdit.ignoreWarning = false;
         this.triggerText = this.getTriggerText();
@@ -11888,6 +11891,10 @@ class CaseEditPageComponent {
             this.caseEdit.callbackErrorsSubject.next(null);
         }
     }
+    clearValidationErrors() {
+        this.validationErrors = [];
+        this.caseEditDataService?.clearFormValidationErrors?.();
+    }
     saveDraft() {
         if (this.eventTrigger.can_save_draft) {
             const draftCaseEventData = this.formValueService.sanitise(this.editForm.value);
@@ -12461,9 +12468,12 @@ class CaseEventCompletionTaskReassignedComponent {
         this.jurisdiction = task.jurisdiction;
         this.caseType = task.case_type_id;
         // Current user is a caseworker?
-        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(task.assignee).subscribe(caseworker => {
-            if (caseworker) {
-                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(task.jurisdiction).subscribe(result => {
+            if (result && result[0].service === task.jurisdiction && result[0].caseworkers) {
+                const caseworker = result[0].caseworkers.find(x => x.idamId === task.assignee);
+                if (caseworker) {
+                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+                }
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?
@@ -37572,9 +37582,12 @@ class TaskAssignedComponent {
         // Current user is a caseworker?
         this.jurisdiction = this.task.jurisdiction;
         this.caseType = this.task.case_type_id;
-        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(this.task.assignee).subscribe(caseworker => {
-            if (caseworker) {
-                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(this.task.jurisdiction).subscribe(result => {
+            if (result && result[0].service === this.task.jurisdiction && result[0].caseworkers) {
+                const caseworker = result[0].caseworkers.find(x => x.idamId === this.task.assignee);
+                if (caseworker) {
+                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+                }
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?