@hmcts/ccd-case-ui-toolkit 7.3.60-fix-case-filter-issue → 7.3.60

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

@@ -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);
@@ -34461,7 +34468,6 @@ class WorkbasketFiltersComponent {
         }
     }
     onJurisdictionIdChange() {
-        this.clearStoredWorkbasketFilterValues();
         if (this.selected.jurisdiction) {
             this.jurisdictionService.announceSelectedJurisdiction(this.selected.jurisdiction);
             this.selectedJurisdictionCaseTypes = this.selected.jurisdiction.caseTypes.length > 0
@@ -34476,7 +34482,7 @@ class WorkbasketFiltersComponent {
             this.selected.caseState = null;
             this.clearWorkbasketInputs();
             if (!this.isApplyButtonDisabled()) {
-                this.onCaseTypeIdChange(false);
+                this.onCaseTypeIdChange();
             }
         }
         else {
@@ -34484,10 +34490,7 @@ class WorkbasketFiltersComponent {
             this.resetCaseState();
         }
     }
-    onCaseTypeIdChange(clearStoredValues = true) {
-        if (clearStoredValues) {
-            this.clearStoredWorkbasketFilterValues();
-        }
+    onCaseTypeIdChange() {
         if (this.selected.caseType) {
             this.selectedCaseTypeStates = this.sortStates(this.selected.caseType.states);
             this.selected.caseState = null;
@@ -34583,7 +34586,7 @@ class WorkbasketFiltersComponent {
                 this.selectedJurisdictionCaseTypes = this.selected.jurisdiction.caseTypes;
                 this.selected.caseType = this.selectCaseType(this.selected, this.selectedJurisdictionCaseTypes, routeSnapshot);
                 if (this.selected.caseType) {
-                    this.onCaseTypeIdChange(false);
+                    this.onCaseTypeIdChange();
                     this.selected.caseState = this.selectCaseState(this.selected.caseType, routeSnapshot);
                 }
                 this.workbasketDefaults = true;
@@ -34630,9 +34633,6 @@ class WorkbasketFiltersComponent {
         this.workbasketInputsReady = false;
         this.workbasketInputs = [];
     }
-    clearStoredWorkbasketFilterValues() {
-        this.windowService.removeLocalStorage(FORM_GROUP_VAL_LOC_STORAGE);
-    }
     resetCaseState() {
         this.defaults.state_id = null;
         this.selected.caseState = null;